Make sure that the scale factor code and DesktopName support works together: Consolidated title update into DesktopWindow::setName.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3579 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/win/vncviewer/DesktopWindow.cxx b/win/vncviewer/DesktopWindow.cxx
index 93a3ab6..2b1ca39 100644
--- a/win/vncviewer/DesktopWindow.cxx
+++ b/win/vncviewer/DesktopWindow.cxx
@@ -1066,10 +1066,7 @@
}
void DesktopWindow::printScale() {
- char *newTitle = new char[strlen(desktopName)+20];
- sprintf(newTitle, "%s @ %i%%", desktopName, getDesktopScale());
- SetWindowText(handle, TStr(newTitle));
- delete [] newTitle;
+ setName(desktopName);
}
void
@@ -1267,8 +1264,13 @@
void
DesktopWindow::setName(const char* name) {
- SetWindowText(handle, TStr(name));
- strCopy(desktopName, name, sizeof(desktopName));
+ if (name != desktopName) {
+ strCopy(desktopName, name, sizeof(desktopName));
+ }
+ char *newTitle = new char[strlen(desktopName)+20];
+ sprintf(newTitle, "%s @ %i%%", desktopName, getDesktopScale());
+ SetWindowText(handle, TStr(newTitle));
+ delete [] newTitle;
}