magnet download not verified for existing data fixed #4089

cfp · cfp · commit c81be4700920 · 2013-10-17T00:18:30.000-05:00
diff --git a/libtransmission/torrent-magnet.c b/libtransmission/torrent-magnet.c
@@ -299,7 +299,10 @@ tr_torrentSetMetadataPiece( tr_torrent  * tor, int piece, const void  * data, in
         {
             incompleteMetadataFree( tor->incompleteMetadata );
             tor->incompleteMetadata = NULL;
-            if( tor->preFetchMagnet ) tor->isStopping = true;
+            tor->isStopping = true;
+            tor->magnetVerify = true;
+            tor->startAfterVerify = !tor->preFetchMagnet;
+            tor->preFetchMagnet = false;
         }
         else /* drat. */
         {
diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
@@ -1967,6 +1967,12 @@ stopTorrent( void * vtor )
     torrentSetQueued( tor, false );
 
     tr_torrentUnlock( tor );
+
+    if( tor->magnetVerify ) {
+        tor->magnetVerify = false;
+        tr_torinf( tor, "Magnet Verify" );
+        tr_torrentVerify( tor );
+    }
 }
 
 void
@@ -2043,6 +2049,7 @@ closeTorrent( void * vtor )
 
     tr_torinf( tor, "%s", _( "Removing torrent" ) );
 
+    tor->magnetVerify = false;
     stopTorrent( tor );
 
     if( tor->isDeleting )
diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h
@@ -250,6 +250,8 @@ struct tr_torrent
     bool                       isDirty;
     bool                       isQueued;
 
+    bool                       magnetVerify;
+
     bool                       infoDictOffsetIsCached;
 
     uint16_t                   maxConnectedPeers;

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,10 @@ tr_torrentSetMetadataPiece( tr_torrent * tor, int piece, const void * data, in`
`299`	`299`	`{`
`300`	`300`	`incompleteMetadataFree( tor->incompleteMetadata );`
`301`	`301`	`tor->incompleteMetadata = NULL;`
`302`		`- if( tor->preFetchMagnet ) tor->isStopping = true;`
	`302`	`+ tor->isStopping = true;`
	`303`	`+ tor->magnetVerify = true;`
	`304`	`+ tor->startAfterVerify = !tor->preFetchMagnet;`
	`305`	`+ tor->preFetchMagnet = false;`
`303`	`306`	`}`
`304`	`307`	`else /* drat. */`
`305`	`308`	`{`