Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 3 files). Show all
Unified · Split
| @@ -26,7 +26,6 @@ · 25 unmodified lines | |||
| 26 | #define __LOC__ __FILE__ "(" __STR1__(__LINE__) ") : Warning Msg: " | 26 | #define __LOC__ __FILE__ "(" __STR1__(__LINE__) ") : Warning Msg: " |
| 27 | 27 | ||
| 28 | static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); | 28 | static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); |
| 29 | static const bool HIFI_SCRIPT_DEBUGGABLES { true }; | ||
| 30 | static const QString SETTINGS_KEY { "RunningScripts" }; | 29 | static const QString SETTINGS_KEY { "RunningScripts" }; |
| 31 | static const QUrl DEFAULT_SCRIPTS_LOCATION { "file:///~//defaultScripts.js" }; | 30 | static const QUrl DEFAULT_SCRIPTS_LOCATION { "file:///~//defaultScripts.js" }; |
| 32 | 31 | ||
| @@ -589,17 +588,7 @@ void ScriptEngines::launchScriptEngine(ScriptEnginePointer scriptEngine) { · 556 unmodified lines | |||
| 589 | 588 | ||
| 590 | // register our application services and set it off on its own thread | 589 | // register our application services and set it off on its own thread |
| 591 | runScriptInitializers(scriptEngine); | 590 | runScriptInitializers(scriptEngine); |
| 592 | 591 | scriptEngine->runInThread(); | |
| 593 | // FIXME disabling 'shift key' debugging for now. If you start up the application with | ||
| 594 | // the shift key held down, it triggers a deadlock because of script interfaces running | ||
| 595 | // on the main thread | ||
| 596 | auto const wantDebug = scriptEngine->isDebuggable(); // || (qApp->queryKeyboardModifiers() & Qt::ShiftModifier); | ||
| 597 | |||
| 598 | if (HIFI_SCRIPT_DEBUGGABLES && wantDebug) { | ||
| 599 | scriptEngine->runDebuggable(); | ||
| 600 | } else { | ||
| 601 | scriptEngine->runInThread(); | ||
| 602 | } | ||
| 603 | } | 592 | } |
| 604 | 593 | ||
| 605 | void ScriptEngines::onScriptFinished(const QString& rawScriptURL, ScriptEnginePointer engine) { | 594 | void ScriptEngines::onScriptFinished(const QString& rawScriptURL, ScriptEnginePointer engine) { |