commit de1a3b95837379b023aa24d8626392838959d437
author Pierre Ossman <ossman@cendio.se> Mon Mar 17 14:29:49 2014 +0100
committer Pierre Ossman <ossman@cendio.se> Mon Jul 07 13:27:07 2014 +0200
tree 2083138fbdde0930b700d6add71edcdf7c1e9d5b
parent 6e5cd5db59b2ddd7dfa94248aa2631f63391d631

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.

vncviewer/Viewport.cxx

diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index 4b8a85b..733e4a2 100644
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -931,7 +931,7 @@
 
   // 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