From: Peter Åstrand (astrand) <astrand@cendio.se>
Date: Wed, 18 Apr 2018 19:49:41 +0000 (+0200)
Subject: Update fullscreen window if changing fullScreenAllMonitors option
X-Git-Tag: v1.8.90~20^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a890572b8d4593143c7e6dc1dd9e776df18feb6e;p=tigervnc.git

Update fullscreen window if changing fullScreenAllMonitors option
---

diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx
index b36f92bf..e86e90e6 100644
--- a/vncviewer/DesktopWindow.cxx
+++ b/vncviewer/DesktopWindow.cxx
@@ -762,7 +762,8 @@ void DesktopWindow::fullscreen_on()
     fullscreen_screens(top, bottom, left, right);
   }
 
-  fullscreen();
+  if (!fullscreen_active())
+    fullscreen();
 }
 
 void DesktopWindow::grabKeyboard()
@@ -1186,7 +1187,9 @@ void DesktopWindow::handleOptions(void *data)
   else
     self->ungrabKeyboard();
 
-  if (fullScreen && !self->fullscreen_active())
+  // Call fullscreen_on even if active since it handles
+  // fullScreenAllMonitors
+  if (fullScreen)
     self->fullscreen_on();
   else if (!fullScreen && self->fullscreen_active())
     self->fullscreen_off();