Olivier Goffart 6 年 前
コミット
a6a0e361c1
2 ファイル変更1 行追加1 行削除
  1. 1 0
      src/libsync/discoveryphase.cpp
  2. 0 1
      test/testsyncmove.cpp

+ 1 - 0
src/libsync/discoveryphase.cpp

@@ -167,6 +167,7 @@ QPair<bool, QByteArray> DiscoveryPhase::findAndCancelDeletedJob(const QString &o
         (*it)->_instruction = CSYNC_INSTRUCTION_NONE;
         result = true;
         oldEtag = (*it)->_etag;
+        _deletedItem.erase(it);
     }
     if (auto *otherJob = _queuedDeletedDirectories.take(originalPath)) {
         oldEtag = otherJob->_dirItem->_etag;

+ 0 - 1
test/testsyncmove.cpp

@@ -833,7 +833,6 @@ private slots:
         QVERIFY(fakeFolder.currentRemoteState().find("C/b1"));
         QVERIFY(fakeFolder.currentRemoteState().find("A/b2"));
         QVERIFY(fakeFolder.currentRemoteState().find("C/b2"));
-        qDebug() << counter.nMOVE << counter.nDELETE << counter.nGET << counter.nPUT;
         QCOMPARE(counter.nMOVE, 0); // Unfortunately, we can't really make a move in this case
         QCOMPARE(counter.nGET, 2);
         QCOMPARE(counter.nPUT, 2);