From f97c3217a54ac6804f83c367deef33da3567cbf5 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 10 Dec 2019 09:52:12 -0800 Subject: [PATCH] allow Linux interface to connect to domain when DISABLE_QML is true --- interface/src/Application.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 221ab211f4..7252a1d707 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3395,6 +3395,10 @@ void Application::initializeUi() { setIsInterstitialMode(true); + +#if defined(DISABLE_QML) && defined(Q_OS_LINUX) + resumeAfterLoginDialogActionTaken(); +#endif } @@ -5662,6 +5666,7 @@ void Application::resumeAfterLoginDialogActionTaken() { return; } +#if !defined(DISABLE_QML) if (!isHMDMode() && getDesktopTabletBecomesToolbarSetting()) { auto toolbar = DependencyManager::get()->getToolbar("com.highfidelity.interface.toolbar.system"); toolbar->writeProperty("visible", true); @@ -5671,6 +5676,7 @@ void Application::resumeAfterLoginDialogActionTaken() { } updateSystemTabletMode(); +#endif { auto userInputMapper = DependencyManager::get();