revert 14136, correct fix for "queued torrents' state changes to paused when restarting transmission"

cfp · cfp · commit 8f69610cf9d0 · 2013-10-01T02:06:27.000-05:00
diff --git a/libtransmission/resume.c b/libtransmission/resume.c
@@ -672,7 +672,7 @@ tr_torrentSaveResume( tr_torrent * tor )
     tr_bencDictAddInt( &top, KEY_UPLOADED, tor->uploadedPrev + tor->uploadedCur );
     tr_bencDictAddInt( &top, KEY_MAX_PEERS, tor->maxConnectedPeers );
     tr_bencDictAddInt( &top, KEY_BANDWIDTH_PRIORITY, tr_torrentGetPriority( tor ) );
-    tr_bencDictAddBool( &top, KEY_PAUSED, !tor->isRunning );
+    tr_bencDictAddBool( &top, KEY_PAUSED, !tor->isRunning && !tor->isQueued );
     savePeers( &top, tor );
     if( tr_torrentHasMetadata( tor ) )
     {
@@ -780,7 +780,7 @@ loadFromFile( tr_torrent * tor, uint64_t fieldsToLoad )
     if( ( fieldsToLoad & TR_FR_RUN )
       && tr_bencDictFindBool( &top, KEY_PAUSED, &boolVal ) )
     {
-        tor->isRunning = !boolVal && !tor->isQueued;
+        tor->isRunning = !boolVal;
         fieldsLoaded |= TR_FR_RUN;
     }
 
diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
@@ -1952,7 +1952,6 @@ stopTorrent( void * vtor )
 
     tr_verifyRemove( tor );
     const bool wasQueued = tr_torrentIsQueued( tor );
-    torrentSetQueued( tor, false );
     tr_peerMgrStopTorrent( tor );
 
     if( !wasQueued )
@@ -1965,6 +1964,8 @@ stopTorrent( void * vtor )
     if( !tor->isDeleting )
         tr_torrentSave( tor );
 
+    torrentSetQueued( tor, false );
+
     tr_torrentUnlock( tor );
 }
 
@@ -3799,6 +3800,7 @@ torrentSetQueued( tr_torrent * tor, bool queued )
     {
         tor->isQueued = queued;
         tor->anyDate = tr_time( );
+        tr_torrentSetDirty( tor );
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,7 @@ tr_torrentSaveResume( tr_torrent * tor )`
`672`	`672`	`tr_bencDictAddInt( &top, KEY_UPLOADED, tor->uploadedPrev + tor->uploadedCur );`
`673`	`673`	`tr_bencDictAddInt( &top, KEY_MAX_PEERS, tor->maxConnectedPeers );`
`674`	`674`	`tr_bencDictAddInt( &top, KEY_BANDWIDTH_PRIORITY, tr_torrentGetPriority( tor ) );`
`675`		`- tr_bencDictAddBool( &top, KEY_PAUSED, !tor->isRunning );`
	`675`	`+ tr_bencDictAddBool( &top, KEY_PAUSED, !tor->isRunning && !tor->isQueued );`
`676`	`676`	`savePeers( &top, tor );`
`677`	`677`	`if( tr_torrentHasMetadata( tor ) )`
`678`	`678`	`{`
`@@ -780,7 +780,7 @@ loadFromFile( tr_torrent * tor, uint64_t fieldsToLoad )`
`780`	`780`	`if( ( fieldsToLoad & TR_FR_RUN )`
`781`	`781`	`&& tr_bencDictFindBool( &top, KEY_PAUSED, &boolVal ) )`
`782`	`782`	`{`
`783`		`- tor->isRunning = !boolVal && !tor->isQueued;`
	`783`	`+ tor->isRunning = !boolVal;`
`784`	`784`	`fieldsLoaded \|= TR_FR_RUN;`
`785`	`785`	`}`
`786`	`786`
Original file line number	Diff line number	Diff line change
`@@ -1952,7 +1952,6 @@ stopTorrent( void * vtor )`
`1952`	`1952`
`1953`	`1953`	`tr_verifyRemove( tor );`
`1954`	`1954`	`const bool wasQueued = tr_torrentIsQueued( tor );`
`1955`		`- torrentSetQueued( tor, false );`
`1956`	`1955`	`tr_peerMgrStopTorrent( tor );`
`1957`	`1956`
`1958`	`1957`	`if( !wasQueued )`
`@@ -1965,6 +1964,8 @@ stopTorrent( void * vtor )`
`1965`	`1964`	`if( !tor->isDeleting )`
`1966`	`1965`	`tr_torrentSave( tor );`
`1967`	`1966`
	`1967`	`+ torrentSetQueued( tor, false );`
	`1968`	`+`
`1968`	`1969`	`tr_torrentUnlock( tor );`
`1969`	`1970`	`}`
`1970`	`1971`
`@@ -3799,6 +3800,7 @@ torrentSetQueued( tr_torrent * tor, bool queued )`
`3799`	`3800`	`{`
`3800`	`3801`	`tor->isQueued = queued;`
`3801`	`3802`	`tor->anyDate = tr_time( );`
	`3803`	`+ tr_torrentSetDirty( tor );`
`3802`	`3804`	`}`
`3803`	`3805`	`}`
`3804`	`3806`