gui: Fix window title update

promag · promag · commit 1ed425ea1763 · 2019-01-19T21:17:51.000Z
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -1225,16 +1225,18 @@ void BitcoinGUI::updateProxyIcon()
 
 void BitcoinGUI::updateWindowTitle()
 {
-    QString window_title = tr(PACKAGE_NAME) + " - ";
+    QString window_title = tr(PACKAGE_NAME);
 #ifdef ENABLE_WALLET
     if (walletFrame) {
         WalletModel* const wallet_model = walletFrame->currentWalletModel();
         if (wallet_model && !wallet_model->getWalletName().isEmpty()) {
-            window_title += wallet_model->getDisplayName() + " - ";
+            window_title += " - " + wallet_model->getDisplayName();
         }
     }
 #endif
-    window_title += m_network_style->getTitleAddText();
+    if (!m_network_style->getTitleAddText().isEmpty()) {
+        window_title += " - " + m_network_style->getTitleAddText();
+    }
     setWindowTitle(window_title);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1225,16 +1225,18 @@ void BitcoinGUI::updateProxyIcon()`
`1225`	`1225`
`1226`	`1226`	`void BitcoinGUI::updateWindowTitle()`
`1227`	`1227`	`{`
`1228`		`- QString window_title = tr(PACKAGE_NAME) + " - ";`
	`1228`	`+ QString window_title = tr(PACKAGE_NAME);`
`1229`	`1229`	`#ifdef ENABLE_WALLET`
`1230`	`1230`	`if (walletFrame) {`
`1231`	`1231`	`WalletModel* const wallet_model = walletFrame->currentWalletModel();`
`1232`	`1232`	`if (wallet_model && !wallet_model->getWalletName().isEmpty()) {`
`1233`		`- window_title += wallet_model->getDisplayName() + " - ";`
	`1233`	`+ window_title += " - " + wallet_model->getDisplayName();`
`1234`	`1234`	`}`
`1235`	`1235`	`}`
`1236`	`1236`	`#endif`
`1237`		`- window_title += m_network_style->getTitleAddText();`
	`1237`	`+ if (!m_network_style->getTitleAddText().isEmpty()) {`
	`1238`	`+ window_title += " - " + m_network_style->getTitleAddText();`
	`1239`	`+ }`
`1238`	`1240`	`setWindowTitle(window_title);`
`1239`	`1241`	`}`
`1240`	`1242`