Merge branch 'mergeAccountGlobalServices' of https://github.com/dback2/hifi into mergeAccountGlobalServices

This commit is contained in:
David Back 2017-12-22 17:00:17 -08:00
commit ab5b238aea

View file

@ -52,8 +52,7 @@ const QString GlobalServicesScriptingInterface::getUsername() const {
auto accountManager = DependencyManager::get<AccountManager>();
if (accountManager->isLoggedIn()) {
return accountManager->getAccountInfo().getUsername();
}
else {
} else {
return "Unknown user";
}
}