Changeset 1190

Timestamp:

Dec 11, 2006, 11:12:09 PM (15 years ago)

Author:

joshe

Message:

Avoid doing some potentially bogus things when stopping and deleting a torrent.

Location:

trunk/gtk

Files:

• tr_backend.c (modified) (2 diffs)
• tr_torrent.c (modified) (1 diff)

trunk/gtk/tr_backend.c

@@ -276 +276 @@
 tr_backend_torrents_stopped(TrBackend *back) {
   GList *ii, *list;
+  tr_stat_t *st;
   gboolean ret = TRUE;
 
@@ -281 +282 @@
 
   list = g_list_copy(back->torrents);
-  for(ii = list; NULL != ii; ii = ii->next)
-    if(!(TR_STATUS_PAUSE & tr_torrent_stat_polite(ii->data)->status))
+  for(ii = list; NULL != ii; ii = ii->next) {
+    st = tr_torrent_stat_polite(ii->data);
+    if(NULL == st || !(TR_STATUS_PAUSE & st->status))
       ret = FALSE;
+  }
   g_list_free(list);
 

trunk/gtk/tr_torrent.c

@@ -451 +451 @@
 tr_torrent_stat_polite(TrTorrent *tor) {
   TrTorrentClass *klass;
-  tr_stat_t *st = tr_torrentStat(tor->handle);
-
-  if(tor->disposed)
-    return st;
-
+  tr_stat_t *st;
+
+  if(tor->disposed)
+    return NULL;
+
+  st = tr_torrentStat(tor->handle);
   if(tor->closing && TR_STATUS_PAUSE & st->status) {
     tor->closing = FALSE;
     klass = g_type_class_peek(TR_TORRENT_TYPE);
     g_signal_emit(tor, klass->paused_signal_id, 0, NULL);
+    return tr_torrent_stat_polite(tor);
   }