Merge branch 'loginOnLaunch' of https://github.com/wayne-chen/hifi into loginOnLaunch

This commit is contained in:
Wayne Chen 2018-09-11 11:02:16 -07:00
commit 800df1b077

View file

@ -2308,7 +2308,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
connect(checkLoginTimer, &QTimer::timeout, this, [this]() {
auto accountManager = DependencyManager::get<AccountManager>();
auto dialogsManager = DependencyManager::get<DialogsManager>();
if (!accountManager->isLoggedIn() && !qApp->isHMDMode()) {
if (!accountManager->isLoggedIn()) {
Setting::Handle<bool>{"loginDialogPoppedUp", false}.set(true);
dialogsManager->showLoginDialog();
QJsonObject loginData = {};