From 2da047136606ed27e9aa1500e2b66e6ddfe383e0 Mon Sep 17 00:00:00 2001
From: zhaominyong <zhaominyong@kylinos.cn>
Date: Mon, 4 Jul 2022 16:21:55 +0800
Subject: [PATCH] =?UTF-8?q?U=E7=9B=98=E5=A4=87=E4=BB=BD=E4=B8=80=E5=8D=8A?=
 =?UTF-8?q?=E6=97=B6=E6=8B=94=E5=87=BAU=E7=9B=98=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=A4=87=E4=BB=BD=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backup-daemon/udiskdatabackupproxy.cpp    | 4 ++++
 backup-daemon/udisksystembackupproxy.cpp  | 4 ++++
 kybackup/module/managebackuppointlist.cpp | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/backup-daemon/udiskdatabackupproxy.cpp b/backup-daemon/udiskdatabackupproxy.cpp
index b552b65..672d02d 100755
--- a/backup-daemon/udiskdatabackupproxy.cpp
+++ b/backup-daemon/udiskdatabackupproxy.cpp
@@ -83,6 +83,8 @@ void UDiskDataBackupProxy::doWorkEx()
  */
 void UDiskDataBackupProxy::cancelEx()
 {
+    qDebug() << "UDiskDataBackupProxy::cancelEx invoke begin";
+
     m_bCancel = true;
     if (!m_isFinished) {
         emit this->checkResult(int(BackupResult::START_CANCEL));
@@ -97,6 +99,8 @@ void UDiskDataBackupProxy::cancelEx()
         deleteFailedData();
         emit this->checkResult(int(BackupResult::CANCEL_SUCCESS));
     }
+
+    qDebug() << "UDiskDataBackupProxy::cancelEx invoke end";
 }
 
 /**
diff --git a/backup-daemon/udisksystembackupproxy.cpp b/backup-daemon/udisksystembackupproxy.cpp
index 02fe69b..ae5f2e4 100755
--- a/backup-daemon/udisksystembackupproxy.cpp
+++ b/backup-daemon/udisksystembackupproxy.cpp
@@ -96,6 +96,8 @@ void UDiskSystemBackupProxy::doWorkEx()
 
 void UDiskSystemBackupProxy::cancelEx()
 {
+    qDebug() << "UDiskSystemBackupProxy::cancelEx invoke begin";
+
     m_bCancel = true;
     if (!m_isFinished) {
         emit this->checkResult(int(BackupResult::START_CANCEL));
@@ -112,6 +114,8 @@ void UDiskSystemBackupProxy::cancelEx()
         deleteFailedData();
         emit this->checkResult(int(BackupResult::CANCEL_SUCCESS));
     }
+
+    qDebug() << "UDiskSystemBackupProxy::cancelEx invoke end";
 }
 
 /**
diff --git a/kybackup/module/managebackuppointlist.cpp b/kybackup/module/managebackuppointlist.cpp
index 064e7dc..f78bb5e 100755
--- a/kybackup/module/managebackuppointlist.cpp
+++ b/kybackup/module/managebackuppointlist.cpp
@@ -123,7 +123,7 @@ void ManageBackupPointList::insertLines(const QList<ParseBackupList::BackupPoint
 //            continue;
 
         //udisk unique
-        if (backupPoint.m_path.startsWith(preDevPath)) {
+        if (backupPoint.m_state == BACKUP_PARSE_STATE_SUCCESS_STRTING && backupPoint.m_path.startsWith(preDevPath)) {
             udisk_setting.beginGroup(backupPoint.m_backupName);
             QString localuuid = udisk_setting.value("uuid").toString();
             udisk_setting.endGroup();