Changeset 14208

Timestamp:

Oct 20, 2013, 5:15:19 PM (9 years ago)

Author:

jordan

Message:

(trunk, libT) #5427 'torrents start in pause' -- fix resume issue with que_restart_v2 patch by cfpp2p

Location:

trunk/libtransmission

Files:

• resume.c (modified) (2 diffs)
• torrent.c (modified) (3 diffs)

trunk/libtransmission/resume.c

@@ -676 +676 @@
   tr_variantDictAddInt (&top, TR_KEY_max_peers, tor->maxConnectedPeers);
   tr_variantDictAddInt (&top, TR_KEY_bandwidth_priority, tr_torrentGetPriority (tor));
-  tr_variantDictAddBool (&top, TR_KEY_paused, !tor->isRunning);
+  tr_variantDictAddBool (&top, TR_KEY_paused, !tor->isRunning && !tor->isQueued);
   savePeers (&top, tor);
   if (tr_torrentHasMetadata (tor))
@@ -779 +779 @@
       && tr_variantDictFindBool (&top, TR_KEY_paused, &boolVal))
     {
-      tor->isRunning = !boolVal && !tor->isQueued; 
+      tor->isRunning = !boolVal;
       fieldsLoaded |= TR_FR_RUN;
     }

trunk/libtransmission/torrent.c

@@ -1865 +1865 @@
 
   tr_verifyRemove (tor);
-  torrentSetQueued (tor, false);
   tr_peerMgrStopTorrent (tor);
   tr_announcerTorrentStopped (tor);
@@ -1874 +1873 @@
   if (!tor->isDeleting)
     tr_torrentSave (tor);
+
+  torrentSetQueued (tor, false);
 
   tr_torrentUnlock (tor);
@@ -3544 +3545 @@
       tor->isQueued = queued;
       tor->anyDate = tr_time ();
+      tr_torrentSetDirty (tor);
     }
 }