Thread cleanup on PACP permission error

If the user didn't have permission for raw ethernet access (or other PCAP related error), the application would crash after displaying the error message box.
docsteer · Jan 28, 2020 · 5b4b2a3 · 5b4b2a3
1 parent 6f1ae83
commit 5b4b2a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/pcapplayback.cpp b/src/pcapplayback.cpp
@@ -34,7 +34,9 @@ void PcapPlayback::openThread()
     connect(sender, SIGNAL(sendingFinished()), this, SLOT(playbackFinished()));
     connect(sender, SIGNAL(sendingClosed()), this, SLOT(playbackClosed()));
     connect(sender, SIGNAL(error(QString)), this, SLOT(error(QString)));
-    connect(sender, SIGNAL(finished()), sender, SLOT(deleteLater()));
+    connect(sender, &QThread::finished, [this]() {
+        sender->deleteLater();
+        sender = Q_NULLPTR; });
     connect(sender, SIGNAL(finished()), this, SLOT(playbackThreadClosed()));
     ui->progressBar->reset();
     sender->start();
@@ -47,7 +49,6 @@ void PcapPlayback::closeThread()
         return;
 
     sender->quit();
-    sender->deleteLater();
     sender = Q_NULLPTR;
 }
 

diff --git a/src/pcapplaybacksender.cpp b/src/pcapplaybacksender.cpp
@@ -197,6 +197,8 @@ void pcapplaybacksender::run()
             QThread::msleep(100);
         }
     }
+
+    exec();
 }
 
 void pcapplaybacksender::quit()
-Original file line number
+Diff line change
@@ Expand Up / @@ -197,6 +197,8 @@ void pcapplaybacksender::run() @@
                 QThread::msleep(100);
             }
         }
+        exec();
     }
     void pcapplaybacksender::quit()
@@ Expand Down @@