Add nullengine exception handling

ferranpujolcamins · Aug 30, 2018 · db7005c · db7005c
1 parent 132d643
commit db7005c
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/src/controllers/engine/controllerengine.cpp b/src/controllers/engine/controllerengine.cpp
@@ -34,7 +34,7 @@ const double kAlphaBetaDt = kScratchTimerMs / 1000.0;
 ControllerEngine::ControllerEngine(Controller* controller)
         : m_pEngine(nullptr),
           m_pController(controller),
-          m_bPopups(false),
+          m_bPopups(true),
           m_pBaClass(nullptr) {
     // Handle error dialog buttons
     qRegisterMetaType<QMessageBox::StandardButton>("QMessageBox::StandardButton");
@@ -311,6 +311,9 @@ bool ControllerEngine::internalExecute(QJSValue thisObject,
     	presentErrorDialogForEvaluationException(exception);
         qDebug() << "Exception evaluating:" << scriptCode;
         return false;
+    } catch (NullEngineException& exception) {
+    	qDebug() << "ControllerEngine::execute: No script engine exists!";
+    	return false;
     }
 
     if (!scriptFunction.isCallable()) {
@@ -825,6 +828,9 @@ QJSValue ControllerEngine::connectControl(
         	actualCallbackFunction = evaluateProgram(passedCallback.toString());
         } catch (EvaluationException& exception) {
         	exceptionHappened = true;
+        } catch (NullEngineException& exception) {
+        	qDebug() << "ControllerEngine::execute: No script engine exists!";
+        	exceptionHappened = true;
         }
 
         if (exceptionHappened || !actualCallbackFunction.isCallable()) {
@@ -959,10 +965,10 @@ bool ControllerEngine::evaluateScriptFile(const QString& scriptName, QList<QStri
     try {
     	QJSValue scriptFunction = evaluateProgram(scriptCode, filename);
     } catch (EvaluationException& exception) {
-    	error = QString("%1 at line %2 in file %4: %5")
-					.arg(error,
-						 exception.line,
-						 exception.filename, exception.errorMessage);
+    	QString error = QString("Evaluation error at line %1 in file %2: %3")
+					.arg(exception.line,
+						 exception.filename,
+						 exception.errorMessage);
 
 		qWarning() << "ControllerEngine:" << error;
 		if (m_bPopups) {
@@ -976,6 +982,9 @@ bool ControllerEngine::evaluateScriptFile(const QString& scriptName, QList<QStri
 			ErrorDialogHandler::instance()->requestErrorDialog(props);
 		}
     	return false;
+    } catch (NullEngineException& exception) {
+    	qDebug() << "ControllerEngine::execute: No script engine exists!";
+    	return false;
     }
 
     return true;