Changeset 2317

Timestamp:

11/25/07 23:59:19 (14 months ago)

Author:

markybob

Message:

try to catch invalid handle in deluge_core

Files:

• tags/deluge-0.5.6.96/src/deluge_core.cpp (modified) (1 diff)
• trunk/src/deluge_core.cpp (modified) (1 diff)

tags/deluge-0.5.6.96/src/deluge_core.cpp

@@ -1788 +1788 @@
     return NULL;
 
-  if (M_torrents->at(index).handle.is_valid()){
-      std::vector<libtorrent::announce_entry> trackerlist;
-      std::istringstream trackers(tracker);
-      std::string line;
-      while (std::getline(trackers, line)) {
-        libtorrent::announce_entry a_entry(line);
-        trackerlist.push_back(a_entry);
+  try {
+      if (M_torrents->at(index).handle.is_valid()){
+        std::vector<libtorrent::announce_entry> trackerlist;
+        std::istringstream trackers(tracker);
+        std::string line;
+        while (std::getline(trackers, line)) {
+          libtorrent::announce_entry a_entry(line);
+          trackerlist.push_back(a_entry);
+        }
+        if (trackerlist.empty()){
+            std::vector<libtorrent::announce_entry> empty;
+            M_torrents->at(index).handle.replace_trackers(empty);
+        }
+        else{
+            M_torrents->at(index).handle.replace_trackers(trackerlist);
+            M_torrents->at(index).handle.force_reannounce();
+        }
       }
-      if (trackerlist.empty()){
-          std::vector<libtorrent::announce_entry> empty;
-          M_torrents->at(index).handle.replace_trackers(empty);
-      }
-      else{
-          M_torrents->at(index).handle.replace_trackers(trackerlist);
-          M_torrents->at(index).handle.force_reannounce();
-      }
-  }
+    }
+  catch (libtorrent::invalid_handle&) {}
   Py_INCREF(Py_None); return Py_None;
 }

trunk/src/deluge_core.cpp

@@ -1788 +1788 @@
     return NULL;
 
-  if (M_torrents->at(index).handle.is_valid()){
-      std::vector<libtorrent::announce_entry> trackerlist;
-      std::istringstream trackers(tracker);
-      std::string line;
-      while (std::getline(trackers, line)) {
-        libtorrent::announce_entry a_entry(line);
-        trackerlist.push_back(a_entry);
+  try {
+      if (M_torrents->at(index).handle.is_valid()){
+        std::vector<libtorrent::announce_entry> trackerlist;
+        std::istringstream trackers(tracker);
+        std::string line;
+        while (std::getline(trackers, line)) {
+          libtorrent::announce_entry a_entry(line);
+          trackerlist.push_back(a_entry);
+        }
+        if (trackerlist.empty()){
+            std::vector<libtorrent::announce_entry> empty;
+            M_torrents->at(index).handle.replace_trackers(empty);
+        }
+        else{
+            M_torrents->at(index).handle.replace_trackers(trackerlist);
+            M_torrents->at(index).handle.force_reannounce();
+        }
       }
-      if (trackerlist.empty()){
-          std::vector<libtorrent::announce_entry> empty;
-          M_torrents->at(index).handle.replace_trackers(empty);
-      }
-      else{
-          M_torrents->at(index).handle.replace_trackers(trackerlist);
-          M_torrents->at(index).handle.force_reannounce();
-      }
-  }
+    }
+  catch (libtorrent::invalid_handle&) {}
   Py_INCREF(Py_None); return Py_None;
 }