Fixed a problem with toolbar that could show up in the full-screen mode.

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

diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx
index eee55ff147ece0f10d0efe82d508b26e8ecefee5..e49b7253935712161b42352885a81805de2d3604 100644 (file)
--- a/vncviewer/DesktopWindow.cxx
+++ b/vncviewer/DesktopWindow.cxx
@@ -298,7 +298,7 @@ void DesktopWindow::setShowToolbar(bool st)
 {
   showToolbar = st;
 
-  if (showToolbar && !tb.isVisible()) {
+  if (showToolbar && !tb.isVisible() && !fullscreenActive) {
     tb.show();
   } else if (!showToolbar && tb.isVisible()) {
     tb.hide();