From 925416ddedf000533e191955d9f35908f77a1b2a Mon Sep 17 00:00:00 2001 From: Marcos Pinto Date: Sun, 28 Oct 2007 02:00:47 +0000 Subject: [PATCH] try to fix persistent.state pooping --- src/deluge_core.cpp | 7 +++---- src/interface.py | 10 ++++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/deluge_core.cpp b/src/deluge_core.cpp index 7727a5996..9377b3524 100644 --- a/src/deluge_core.cpp +++ b/src/deluge_core.cpp @@ -1778,8 +1778,7 @@ static PyObject *torrent_replace_trackers(PyObject *self, PyObject *args) if (PyErr_Occurred()) return NULL; - torrent_handle& h = M_torrents->at(index).handle; - if (h.is_valid()){ + if (M_torrents->at(index).handle.is_valid()){ std::vector trackerlist; std::istringstream trackers(tracker); std::string line; @@ -1787,8 +1786,8 @@ static PyObject *torrent_replace_trackers(PyObject *self, PyObject *args) libtorrent::announce_entry a_entry(line); trackerlist.push_back(a_entry); } - h.replace_trackers(trackerlist); - h.force_reannounce(); + M_torrents->at(index).handle.replace_trackers(trackerlist); + M_torrents->at(index).handle.force_reannounce(); } Py_INCREF(Py_None); return Py_None; } diff --git a/src/interface.py b/src/interface.py index 71fb7cf29..ed644c1ca 100644 --- a/src/interface.py +++ b/src/interface.py @@ -947,11 +947,17 @@ window, please enter your password")) unique_id = self.manager.get_torrent_unique_id(torrent) try: if self.manager.unique_IDs[unique_id].trackers: - self.manager.replace_trackers(unique_id, \ + try: + self.manager.replace_trackers(unique_id, \ self.manager.unique_IDs[unique_id].trackers) + except: + pass if self.manager.unique_IDs[unique_id].uploaded_memory: - self.manager.unique_IDs[unique_id].initial_uploaded_memory \ + try: + self.manager.unique_IDs[unique_id].initial_uploaded_memory \ = self.manager.unique_IDs[unique_id].uploaded_memory + except: + pass except AttributeError: pass