Changeset 7827 for trunk

Timestamp:

Feb 4, 2009, 6:54:29 PM (13 years ago)

Author:

charles

Message:

(trunk libT) maybe fix the crasher (on the mac) that I introduced this morning. or maybe not. hard to know w/o being on a mac.

File:

• trunk/libtransmission/tracker.c (modified) (4 diffs)

trunk/libtransmission/tracker.c

@@ -837 +837 @@
 struct tr_tracker_handle
 {
+    tr_bool     shutdownHint;
     int         runningCount;
     tr_timer *  pulseTimer;
@@ -855 +856 @@
 void
 tr_trackerSessionClose( tr_session * session )
+{
+    assert( tr_isSession( session ) );
+
+    session->tracker->shutdownHint = TRUE;
+}
+
+static void
+tr_trackerSessionDestroy( tr_session * session )
 {
     if( session && session->tracker )
@@ -944 +953 @@
     const time_t               now = time( NULL );
 
-    if( !session->tracker )
+    if( !th )
         return FALSE;
 
@@ -979 +988 @@
 
     /* free the tracker manager if no torrents are left */
-    if( ( session->tracker )
-      && ( session->tracker->runningCount < 1 )
-      && ( tr_sessionCountTorrents( session ) == 0 ) )
-    {
-        tr_trackerSessionClose( session );
-    }
-
-    /* if there are still running torrents (as indicated by
-     * the existence of the tracker manager) then keep the
-     * trackerPulse() timer alive */
-    return session->tracker != NULL;
+    if(    ( th != NULL )
+        && ( th->shutdownHint != FALSE )
+        && ( th->runningCount < 1 )
+        && ( tr_sessionCountTorrents( session ) == 0 ) )
+    {
+        tr_trackerSessionDestroy( session );
+        return FALSE;
+    }
+
+    return TRUE;
 }