Interrupt verification ASAP if torrent is being removed

diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index 980f1f73b1ae82ac6e610345b4e179a5243cc3e4..c2890cfbb3723613bdd08c74f16195572770b89a 100644 (file)
--- a/libtransmission/torrent.c
+++ b/libtransmission/torrent.c
@@ -1773,6 +1773,9 @@ onVerifyDoneThreadFunc (void * vdata)
   struct verify_data * data = vdata;
   tr_torrent * tor = data->tor;
 
+  if (tor->isDeleting)
+    goto cleanup;
+
   if (!data->aborted)
     tr_torrentRecheckCompleteness (tor);
 
@@ -1785,6 +1788,7 @@ onVerifyDoneThreadFunc (void * vdata)
       torrentStart (tor, false);
     }
 
+cleanup:
   tr_free (data);
 }
 
@@ -1793,6 +1797,13 @@ onVerifyDone (tr_torrent * tor, bool aborted, void * vdata)
 {
   struct verify_data * data = vdata;
   assert (data->tor == tor);
+
+  if (tor->isDeleting)
+    {
+      tr_free (data);
+      return;
+    }
+
   data->aborted = aborted;
   tr_runInEventThread (tor->session, onVerifyDoneThreadFunc, data);
 }
@@ -1805,6 +1816,12 @@ verifyTorrent (void * vdata)
   tr_torrent * tor = data->tor;
   tr_sessionLock (tor->session);
 
+  if (tor->isDeleting)
+    {
+      tr_free (data);
+      goto unlock;
+    }
+
   /* if the torrent's already being verified, stop it */
   tr_verifyRemove (tor);
 
@@ -1818,6 +1835,7 @@ verifyTorrent (void * vdata)
   else
     tr_verifyAdd (tor, onVerifyDone, data);
 
+unlock:
   tr_sessionUnlock (tor->session);
 }