Merge #15210: gui: Fix window title update

1ed425ea17639c20ad3b3e3ef4b34d669b2fd2a4 gui: Fix window title update (João Barbosa)

Pull request description:

  Removes trailing `-` from window title when running on mainnet.

  Reported by @Sjors in https://github.com/bitcoin/bitcoin/pull/15149#issuecomment-455787938.

Tree-SHA512: 22f13c361496720f30a4926d928851ed74456c0d70bd313b0ebaca91a9ebfde96991091ac3d1b094f33d3ce9afafd709eb1917f00d96fa3ca69751b6b14e1d2b
This commit is contained in:
Wladimir J. van der Laan 2019-01-21 16:48:14 +01:00 committed by pasta
parent 39bea9bbe6
commit 062e065f4c

View File

@ -1703,20 +1703,22 @@ 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();
QString userWindowTitle = QString::fromStdString(gArgs.GetArg("-windowtitle", ""));
if (!userWindowTitle.isEmpty()) {
window_title += userWindowTitle + " - ";
window_title += " - " + userWindowTitle;
}
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);
}