From 105a615745361c85c2d4b2f6a4e6e6d4e99445db Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 22 Aug 2018 14:09:20 -0700
Subject: [PATCH] Fix no-ui crashes
---
interface/src/Application.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 2fe67ec5cb..21b953b686 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2663,6 +2663,10 @@ Application::~Application() {
void Application::initializeGL() {
qCDebug(interfaceapp) << "Created Display Window.";
+#ifdef DISABLE_QML
+ setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity);
+#endif
+
// initialize glut for shape drawing; Qt apparently initializes it on OS X
if (_isGLInitialized) {
return;
@@ -6870,6 +6874,9 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
shortName = shortName.mid(startIndex, endIndex - startIndex);
}
+#ifdef DISABLE_QML
+ DependencyManager::get<ScriptEngines>()->loadScript(scriptFilenameOrURL);
+#else
QString message = "Would you like to run this script:\n" + shortName;
ModalDialogListener* dlg = OffscreenUi::asyncQuestion(getWindow(), "Run Script", message,
QMessageBox::Yes | QMessageBox::No);
@@ -6884,7 +6891,7 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
}
QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
});
-
+#endif
return true;
}