Fixed the bug with wrong desktop window size of the

vncviewer when it starts in the scaling mode.

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

diff --git a/win/vncviewer/DesktopWindow.cxx b/win/vncviewer/DesktopWindow.cxx
index 4a316ad5e18ee0570db34658b607f26a43312ed3..679964a0e964e586964bafccf4a4533b99e32472 100644 (file)
--- a/win/vncviewer/DesktopWindow.cxx
+++ b/win/vncviewer/DesktopWindow.cxx
@@ -1013,7 +1013,7 @@ void DesktopWindow::setDesktopScale(int scale_) {
   if (buffer->getScale() == scale_ || scale_ <= 0) return;
   buffer->setScale(scale_);
   if (isToolbarEnabled()) refreshToolbarButtons();
-  if (!isAutoScaling()) resizeDesktopWindowToBuffer();
+  if (!isAutoScaling() && !isFullscreen()) resizeDesktopWindowToBuffer();
   char *newTitle = new char[strlen(desktopName)+20];
   sprintf(newTitle, "%s @ %i%%", desktopName, getDesktopScale());
   SetWindowText(handle, TStr(newTitle));