@@ -475,6 +475,7 @@ void Application::initialize(const QCommandLineParser &parser) {
475
475
_entityEditSender = std::make_shared<EntityEditPacketSender>();
476
476
_graphicsEngine = std::make_shared<GraphicsEngine>();
477
477
_applicationOverlay = std::make_shared<ApplicationOverlay>();
478
+ _dialogsManagerScriptingInterface = new DialogsManagerScriptingInterface ();
478
479
479
480
auto steamClient = PluginManager::getInstance ()->getSteamClientPlugin ();
480
481
setProperty (hifi::properties::STEAM, (steamClient && steamClient->isRunning ()));
@@ -585,8 +586,9 @@ void Application::initialize(const QCommandLineParser &parser) {
585
586
}
586
587
587
588
#if !defined(Q_OS_ANDROID) && !defined(DISABLE_QML)
589
+ const bool DISABLE_LOGIN_SCREEN = true ; // Login screen is currently disabled
588
590
// Do not show login dialog if requested not to on the command line
589
- if (parser.isSet (" no-login-suggestion" )) {
591
+ if (DISABLE_LOGIN_SCREEN || parser.isSet (" no-login-suggestion" )) {
590
592
_noLoginSuggestion = true ;
591
593
}
592
594
#endif
@@ -803,6 +805,10 @@ void Application::initialize(const QCommandLineParser &parser) {
803
805
showCursor (Cursor::Manager::lookupIcon (_preferredCursor.get ()));
804
806
}
805
807
808
+ // An audio device changed signal received before the display plugins are set up will cause a crash,
809
+ // so we defer the setup of the `scripting::Audio` class until this point
810
+ DependencyManager::set<AudioScriptingInterface, scripting::Audio>();
811
+
806
812
// Create the rendering engine. This can be slow on some machines due to lots of
807
813
// GPU pipeline creation.
808
814
initializeRenderEngine ();
@@ -2016,17 +2022,13 @@ void Application::setupSignalsAndOperators() {
2016
2022
resumeAfterLoginDialogActionTaken ();
2017
2023
});
2018
2024
#else
2019
- // Do not show login dialog if requested not to on the command line
2020
- if (_noLoginSuggestion) {
2021
- connect (offscreenUi, &OffscreenUi::keyboardFocusActive, [this ]() {
2022
- resumeAfterLoginDialogActionTaken ();
2023
- });
2024
- } else {
2025
- connect (offscreenUi, &OffscreenUi::keyboardFocusActive, [this ]() {
2025
+ connect (offscreenUi, &OffscreenUi::keyboardFocusActive, [this ]() {
2026
+ // Do not show login dialog if requested not to on the command line
2027
+ if (!_noLoginSuggestion) {
2026
2028
showLoginScreen ();
2027
- resumeAfterLoginDialogActionTaken ();
2028
- } );
2029
- }
2029
+ }
2030
+ resumeAfterLoginDialogActionTaken ( );
2031
+ });
2030
2032
#endif
2031
2033
2032
2034
// Monitor model assets (e.g., from Clara.io) added to the world that may need resizing.
@@ -2124,9 +2126,7 @@ void Application::setupSignalsAndOperators() {
2124
2126
});
2125
2127
audioIO->startThread ();
2126
2128
2127
- // An audio device changed signal received before the display plugins are set up will cause a crash,
2128
- // so we defer the setup of the `scripting::Audio` class until this point
2129
- auto audioScriptingInterface = DependencyManager::set<AudioScriptingInterface, scripting::Audio>().data ();
2129
+ auto audioScriptingInterface = DependencyManager::get<AudioScriptingInterface>().data ();
2130
2130
connect (audioIO, &AudioClient::mutedByMixer, audioScriptingInterface, &AudioScriptingInterface::mutedByMixer);
2131
2131
connect (audioIO, &AudioClient::receivedFirstPacket, audioScriptingInterface, &AudioScriptingInterface::receivedFirstPacket);
2132
2132
connect (audioIO, &AudioClient::disconnected, audioScriptingInterface, &AudioScriptingInterface::disconnected);
0 commit comments