Allow accessing engine exceptions from ScriptManager

Dale Glass committed 3 years ago

Commit bb74c2e1 parent de02da52 files · +17 −1Browse files

Showing the changes to libraries/script-engine/src/ScriptManager.cpp (1 of 2 files). Show all

Unified · Split

     return message;
 }
+std::shared_ptr<ScriptException> ScriptManager::getUncaughtException() const {
+    return _engine->uncaughtException();
+}
 ScriptManagerPointer scriptManagerFactory(ScriptManager::Context context,
                                                  const QString& scriptContents,
                                                  const QString& fileNameString) {
     });
 #endif
+    // Forward exceptions from the scripting engine
+    connect(_engine.get(), &ScriptEngine::exception, this, &ScriptManager::unhandledException);
     if (_type == Type::ENTITY_CLIENT || _type == Type::ENTITY_SERVER) {
         QObject::connect(this, &ScriptManager::update, this, [this]() {
             // process pending entity script content
             qCWarning(scriptengine) << "Engine has uncaught exception, stopping";
             stop();
-            _engine->clearExceptions();
+            // V8TODO: Is clearing needed here?
+            //_engine->clearExceptions();
         }
     }
 #ifdef _WIN32