Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-04 11:30:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13999 from gcalero/dont_popup_login_android

Browse source 
Don't popup login dialog in android
This commit is contained in:
John Conklin II 2018-09-14 16:06:03 -07:00 committed by GitHub
commit be76c43aec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -2302,8 +2302,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground); connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground);
connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground); connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground);
AndroidHelper::instance().notifyLoadComplete(); AndroidHelper::instance().notifyLoadComplete();
#endif #else
static int CHECK_LOGIN_TIMER = 3000; static int CHECK_LOGIN_TIMER = 3000;
QTimer* checkLoginTimer = new QTimer(this); QTimer* checkLoginTimer = new QTimer(this);
checkLoginTimer->setInterval(CHECK_LOGIN_TIMER); checkLoginTimer->setInterval(CHECK_LOGIN_TIMER);
@ -2321,6 +2320,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
}); });
Setting::Handle<bool>{"loginDialogPoppedUp", false}.set(false); Setting::Handle<bool>{"loginDialogPoppedUp", false}.set(false);
checkLoginTimer->start(); checkLoginTimer->start();
#endif
} }
void Application::updateVerboseLogging() { void Application::updateVerboseLogging() {