Merge pull request #64 from synacker/bug/fix_thread_termination

Fixed thread termination
synacker · Dec 10, 2023 · 434ed8e · 434ed8e
2 parents 10af81c + 5ac7164
commit 434ed8e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Daggy/CConsoleDaggy.cpp b/src/Daggy/CConsoleDaggy.cpp
@@ -47,10 +47,17 @@ CConsoleDaggy::CConsoleDaggy(QObject* parent)
     connect(qApp, &QCoreApplication::aboutToQuit, this, &CConsoleDaggy::fixPcaps);
 }
 
+CConsoleDaggy::~CConsoleDaggy()
+{
+    file_thread_.terminate();
+    file_thread_.wait();
+}
+
 std::error_code CConsoleDaggy::prepare()
 {
     if (daggy_core_)
         return errors::success;
+
     settings_ = parse();
     Sources sources;
     switch (settings_.data_source_text_type) {
@@ -88,15 +95,13 @@ std::error_code CConsoleDaggy::start()
 void CConsoleDaggy::stop()
 {
     if (need_hard_stop_) {
-        qWarning() << "HARD STOP";
+        console_aggreagator_->printAppMessage("HARD STOP");
         delete daggy_core_;
         qApp->exit();
     } else {
         daggy_core_->stop();
         need_hard_stop_ = true;
     }
-    file_thread_.quit();
-    file_thread_.wait();
 }
 
 bool CConsoleDaggy::handleSystemSignal(const int signal)

diff --git a/src/Daggy/CConsoleDaggy.hpp b/src/Daggy/CConsoleDaggy.hpp
@@ -49,6 +49,7 @@ class CConsoleDaggy : public QObject,
     Q_OBJECT
 public:
     CConsoleDaggy(QObject* parent = nullptr);
+    ~CConsoleDaggy();
 
     std::error_code prepare();
     std::error_code start();