Merge branch 'master' of https://github.com/worklist/hifi into 19507

Stojce Slavkovski committed 12 years ago

Commit 7f96f812 parents f668cc8 2bc605e5 files · +2 −73Browse files

Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all

Unified · Split

interface/src/Application.cpp+2−2

@@ -3096,8 +3096,8 @@ void Application::updateWindowTitle(){ · 3095 unmodified lines
3096	3096	NodeList* nodeList = NodeList::getInstance();
3097	3097
3098	3098	QString username = AccountManager::getInstance().getAccountInfo().getUsername();
3099		− QString title = QString() + (!username.isEmpty() ? username + " " : QString()) + nodeList->getSessionUUID().toString()
3100		− + " @ " + nodeList->getDomainHandler().getHostname() + buildVersion;
	3099	+ QString title = QString() + (!username.isEmpty() ? username + " @ " : QString())
	3100	+ + nodeList->getDomainHandler().getHostname() + buildVersion;
3101	3101	qDebug("Application title set to: %s", title.toStdString().c_str());
3102	3102	_window->setWindowTitle(title);
3103	3103	}