summaryrefslogtreecommitdiffstats
path: root/vncviewer/Viewport.cxx
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2014-03-17 14:29:49 +0100
committerPierre Ossman <ossman@cendio.se>2014-07-07 13:27:07 +0200
commitde1a3b95837379b023aa24d8626392838959d437 (patch)
tree2083138fbdde0930b700d6add71edcdf7c1e9d5b /vncviewer/Viewport.cxx
parent6e5cd5db59b2ddd7dfa94248aa2631f63391d631 (diff)
downloadtigervnc-de1a3b95837379b023aa24d8626392838959d437.tar.gz
tigervnc-de1a3b95837379b023aa24d8626392838959d437.zip
Check that we have a cursor to restore
Forgot to check that we actually have a cursor from the server before trying to switch back to it after dismissing the context menu.
Diffstat (limited to 'vncviewer/Viewport.cxx')
-rw-r--r--vncviewer/Viewport.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index 4b8a85b0..733e4a20 100644
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -931,7 +931,7 @@ void Viewport::popupContextMenu()
// Back to our proper mouse pointer.
#ifdef HAVE_FLTK_CURSOR
- if (Fl::belowmouse() == this)
+ if ((Fl::belowmouse() == this) && cursor)
window()->cursor(cursor, cursorHotspot.x, cursorHotspot.y);
#endif