Windows: Use abort message instead of non-working terminate

hluk · Sep 21, 2019 · 02e69ff · 02e69ff
1 parent bcb3a7d
commit 02e69ff
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -1454,7 +1454,7 @@ void MainWindow::terminateAction(int *actionId)
 
     const int id = *actionId;
     *actionId = -1;
-    m_actionHandler->terminateAction(id);
+    emit sendActionData(id, "ABORT");
 }
 
 bool MainWindow::isItemMenuDefaultActionValid() const

diff --git a/src/scriptable/scriptable.cpp b/src/scriptable/scriptable.cpp
@@ -2434,7 +2434,12 @@ void Scriptable::runDisplayCommands()
     QTimer timer;
     timer.setSingleShot(true);
     timer.setInterval(0);
-    connect(this, &Scriptable::dataReceived, &loop, [&]() {
+    connect(this, &Scriptable::dataReceived, &loop, [&](const QByteArray &receivedBytes) {
+        if (receivedBytes == "ABORT") {
+            abortEvaluation(Abort::AllEvaluations);
+            return;
+        }
+
         timer.start();
     });
 
@@ -2457,8 +2462,8 @@ void Scriptable::runDisplayCommands()
 
     emit receiveData();
 
-    loop.exec();
-
+    if (m_abort == Abort::None)
+        loop.exec();
 }
 
 void Scriptable::runMenuCommandFilters()
@@ -2475,6 +2480,11 @@ void Scriptable::runMenuCommandFilters()
     timer.setInterval(0);
 
     connect(this, &Scriptable::dataReceived, &loop, [&](const QByteArray &receivedBytes) {
+        if (receivedBytes == "ABORT") {
+            abortEvaluation(Abort::AllEvaluations);
+            return;
+        }
+
         bytes = receivedBytes;
         if ( !bytes.isEmpty() )
             timer.start();
@@ -2517,7 +2527,8 @@ void Scriptable::runMenuCommandFilters()
 
     emit receiveData();
 
-    loop.exec();
+    if (m_abort == Abort::None)
+        loop.exec();
 }
 
 void Scriptable::monitorClipboard()