Changeset 6975

Timestamp:

Oct 28, 2008, 3:13:07 PM (12 years ago)

Author:

charles

Message:

#1308: Transmission forgets it's verifying data

Location:

trunk/libtransmission

Files:

• torrent.c (modified) (1 diff)
• verify.c (modified) (1 diff)
• verify.h (modified) (1 diff)

trunk/libtransmission/torrent.c

@@ -1125 +1125 @@
     if( !tor->isRunning )
     {
-        if( reloadProgress )
+        const int isVerifying = tr_verifyInProgress( tor );
+
+        if( !isVerifying && reloadProgress )
             tr_torrentLoadResume( tor, TR_FR_PROGRESS, NULL );
+
         tor->isRunning = 1;
-        tr_verifyAdd( tor, checkAndStartCB );
+
+        if( !isVerifying )
+            tr_verifyAdd( tor, checkAndStartCB );
     }
 

trunk/libtransmission/verify.c

@@ -202 +202 @@
 }
 
+int
+tr_verifyInProgress( const tr_torrent * tor )
+{
+    int found = FALSE;
+    tr_lock * lock = getVerifyLock( );
+    tr_lockLock( lock );
+
+    found = ( tor == currentNode.torrent )
+         || ( tr_list_find( verifyList, tor, compareVerifyByTorrent ) != NULL );
+
+    tr_lockUnlock( lock );
+    return found;
+}
+
 void
 tr_verifyRemove( tr_torrent * tor )

trunk/libtransmission/verify.h

@@ -21 +21 @@
 void tr_verifyRemove( tr_torrent * tor );
 
+int tr_verifyInProgress( const tr_torrent * tor );
+
 #endif