https://github.com/mwcproject/mwc-qt-wallet/issues/319

Author: bayk

wallet/mwc713.cpp

@@ -327,13 +327,27 @@ void MWC713::processStop(bool exitNicely) {
     emit onMwcAddressWithIndex("",1);
 
     if (mwc713process) {
+        // Waitiong for task Q to be empty
+        // Note, event processing can change a lot for us, so we shoudl watch for variables
         if (exitNicely) {
             qDebug() << "start exiting...";
-            executeMwc713command("exit", "");
 
-            if (!util::processWaitForFinished( mwc713process, 5000, "mwc713")) {
+            int taskTimeout = 0;
+            if (eventCollector != nullptr)
+                taskTimeout += eventCollector->cancelTasksInQueue();
+
+            if (taskTimeout <= 10000) {
+                executeMwc713command("exit", "");
+            }
+            else {
+                logger::logInfo("MWC713", QString("mwc713 terminating because running long task that required to stop ") + QString::number(taskTimeout) + "ms");
+                taskTimeout  = 0;
+                mwc713process->terminate();
+            }
+
+            if (!util::processWaitForFinished( mwc713process, 3000 + taskTimeout, "mwc713")) {
                 mwc713process->terminate();
-                util::processWaitForFinished( mwc713process, 5000, "mwc713");
+                util::processWaitForFinished( mwc713process, 3000 + taskTimeout, "mwc713");
             }
             qDebug() << "mwc713 is exited";
         }

wallet/mwc713events.cpp

@@ -158,6 +158,18 @@ bool Mwc713EventManager::addFirstTask( Mwc713Task * task, int64_t timeout) {
     return true;
 }
 
+// Running and waiting tasks number
+int Mwc713EventManager::cancelTasksInQueue() {
+    QMutexLocker l( &taskQMutex );
+
+    if (taskQ.isEmpty()) {
+        return 0;
+    }
+
+    taskQ.resize(1);
+    return taskQ[0].timeout;
+}
+
 
 // Process next task
 void Mwc713EventManager::processNextTask() {

wallet/mwc713events.h

@@ -155,6 +155,9 @@ class Mwc713EventManager : public QObject
 
     const QVector<WEvent> & getEvents() const {return events;}
 
+    // Cancelling all tasks except the current one. Return timeout valiue that needed to wait
+    int cancelTasksInQueue();
+
     // clean all tasks, events and all
     void clear();
 public slots: