From: Adam Tkac <atkac@redhat.com>
Date: Mon, 11 Jan 2010 13:46:48 +0000 (+0000)
Subject: [Bugfix] vncviewer could crash when started with no arguments and user clicked
X-Git-Tag: v1.0.90~355
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cc247c9e0eb575785288e8e12d1eb22df60bfd85;p=tigervnc.git

[Bugfix] vncviewer could crash when started with no arguments and user clicked
on "Options" and "OK". Thanks to Jan Gorig for the patch.

Reference: https://bugzilla.redhat.com/show_bug.cgi?id=541755


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3941 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/unix/vncviewer/CConn.cxx b/unix/vncviewer/CConn.cxx
index 2454be21..aa21daaa 100644
--- a/unix/vncviewer/CConn.cxx
+++ b/unix/vncviewer/CConn.cxx
@@ -684,7 +684,8 @@ void CConn::getOptions() {
       desktop->resetLocalCursor();
   }
   dotWhenNoCursor.setParam(options.dotWhenNoCursor.checked());
-  desktop->setNoCursor();
+  if (desktop)
+    desktop->setNoCursor();
   checkEncodings();
 }