Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:23:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removed test.

Browse source
This commit is contained in:
NissimHadar 2019-03-11 20:24:34 -07:00
parent 80168058f7
commit 1a9f33ef66
2 changed files with 9204 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9191
interface/src/Application - Copy.cpp Normal file
View file

File diff suppressed because it is too large Load diff

14
interface/src/Application.cpp
View file

@ -1795,7 +1795,19 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
});
connect(offscreenUi.data(), &OffscreenUi::keyboardFocusActive, [this]() {
resumeAfterLoginDialogActionTaken();
#if !defined(Q_OS_ANDROID) && !defined(DISABLE_QML)
// Do not show login dialog if requested not to on the command line
QString hifiNoLoginCommandLineKey = QString("--").append(HIFI_NO_LOGIN_COMMAND_LINE_KEY);
int index = arguments().indexOf(hifiNoLoginCommandLineKey);
if (index != -1) {
resumeAfterLoginDialogActionTaken();
return;
}
showLoginScreen();
#else
resumeAfterLoginDialogActionTaken();
#endif
});
// Make sure we don't time out during slow operations at startup