Changeset 23

Timestamp:

Jan 12, 2006, 7:01:41 PM (15 years ago)

Author:

root

Message:

Update 2005-12-29

Location:

trunk

Files:

• gtk/main.c (modified) (1 diff)
• libtransmission/transmission.c (modified) (2 diffs)

trunk/gtk/main.c

@@ -808 +808 @@
     switch(act) {
       case ACT_START:
-        if(TR_STATUS_STOPPING & sb[index].status)
-          fprintf(stderr, "XXX still running\n");
-        else
-          tr_torrentStart(data->tr, index);
+        tr_torrentStart(data->tr, index);
         updatesave = TRUE;
         break;

trunk/libtransmission/transmission.c

@@ -26 +26 @@
  * Local prototypes
  **********************************************************************/
+static void torrentReallyStop( tr_handle_t * h, int t );
 static void  downloadLoop( void * );
 static float rateDownload( tr_torrent_t * );
@@ -232 +233 @@
     uint64_t       now;
     int            i;
+
+    if( tor->status & ( TR_STATUS_STOPPING | TR_STATUS_STOPPED ) )
+    {
+        /* Join the thread first */
+        torrentReallyStop( h, t );
+    }
 
     tor->status   = TR_STATUS_CHECK;