From af9a734bf35decc35d013a209b3417b48859f1b4 Mon Sep 17 00:00:00 2001
From: sunwen <sunwen@eq9hj.com>
Date: Wed, 11 Jun 2025 16:47:18 +0800
Subject: [PATCH] feat: Change quit move thread logic.

---
 src/src/PACS/Network/moveworker.cpp  | 6 +++++-
 src/src/PACS/Widget/importwidget.cpp | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/src/PACS/Network/moveworker.cpp b/src/src/PACS/Network/moveworker.cpp
index 4bd18de..55fa2ae 100644
--- a/src/src/PACS/Network/moveworker.cpp
+++ b/src/src/PACS/Network/moveworker.cpp
@@ -15,7 +15,7 @@ MoveWorker::MoveWorker(unsigned long ourPort, const std::string& ourTitle, QObje
 
 MoveWorker::~MoveWorker()
 {
-    mMoveStoreThread->quit();
+    mMoveStoreThread->terminate();
     mMoveStoreThread->wait();
     mMoveStoreThread->deleteLater();
     return;
@@ -106,6 +106,10 @@ void MoveWorker::moveByStudyInstanceUID(const QString& studyInstanceUID)
             {
                 emit notifyMoveDone(0, mStrOutputDirectory);
             }
+            else
+            {
+                emit notifyMoveDone(1, "");
+            }
         }
         mScu->releaseAssociation();
     }
diff --git a/src/src/PACS/Widget/importwidget.cpp b/src/src/PACS/Widget/importwidget.cpp
index 0f895d1..f468bac 100644
--- a/src/src/PACS/Widget/importwidget.cpp
+++ b/src/src/PACS/Widget/importwidget.cpp
@@ -81,7 +81,7 @@ ImportWidget::~ImportWidget()
 
     if (mMoveWorkerThread != nullptr && !mMoveWorkerThread->isFinished())
 	{
-        mMoveWorkerThread->exit();
+        mMoveWorkerThread->terminate();
         mMoveWorkerThread->wait();
         delete mMoveWorkerThread;
         mMoveWorkerThread = nullptr;
@@ -645,6 +645,7 @@ void ImportWidget::executeCMove(const QModelIndex &current)
         return;
     }
     mMoveWorker->setPacsInfo(peerIP,peerPort,peerTitle);
+    mMoveWorker->setListenInfo(ourTitle, ourPort);
     mMoveWorker->setOutputDirectory(QString::fromStdString(outDirectory));
 
     QMetaObject::invokeMethod(mMoveWorker, "moveByStudyInstanceUID", Qt::QueuedConnection, Q_ARG(QString, QString::fromStdString(studyInstanceUID)));