summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2010-01-19 11:21:29 +0000
committerAdam Tkac <atkac@redhat.com>2010-01-19 11:21:29 +0000
commita796f75f71605a356234bb1b7a8d94b66218fc53 (patch)
tree36f531ca8af65c77d9302136f52dc6765363763f
parentbc8c368018d45b4dc458abc1c03650377ebfe72c (diff)
downloadtigervnc-a796f75f71605a356234bb1b7a8d94b66218fc53.tar.gz
tigervnc-a796f75f71605a356234bb1b7a8d94b66218fc53.zip
[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/branches/1_0@3948 3789f03b-4d11-0410-bbf8-ca57d06f2519
-rw-r--r--unix/vncviewer/CConn.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/unix/vncviewer/CConn.cxx b/unix/vncviewer/CConn.cxx
index bc7266d4..ebec4fd4 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();
}