summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcos Pinto <markybob@dipconsultants.com>2007-11-26 17:03:04 +0000
committerMarcos Pinto <markybob@dipconsultants.com>2007-11-26 17:03:04 +0000
commit88b454370f2f125c730acb8536ca48ba9119544f (patch)
tree5f67b38616241194231e42fbff15f5197484bea1
parent0f680b43e372cf8926ef42ddde64b8d396adf60a (diff)
downloaddeluge-88b454370f2f125c730acb8536ca48ba9119544f.tar.gz
deluge-88b454370f2f125c730acb8536ca48ba9119544f.tar.bz2
deluge-88b454370f2f125c730acb8536ca48ba9119544f.zip
tweak try/catch again
-rw-r--r--src/deluge_core.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/deluge_core.cpp b/src/deluge_core.cpp
index f4adc83d7..4de7e2bf8 100644
--- a/src/deluge_core.cpp
+++ b/src/deluge_core.cpp
@@ -182,10 +182,10 @@ long get_torrent_index(torrent_handle &handle)
long get_index_from_unique_ID(long unique_ID)
{
try{
- for (unsigned long i = 0; i < M_torrents->size(); i++)
- if ((*M_torrents)[i].unique_ID == unique_ID)
- return i;
- RAISE_INT(DelugeError, "No such unique_ID.");
+ for (unsigned long i = 0; i < M_torrents->size(); i++)
+ if ((*M_torrents)[i].unique_ID == unique_ID)
+ return i;
+ RAISE_INT(DelugeError, "No such unique_ID.");
}
catch(invalid_handle&)
{
@@ -1802,11 +1802,11 @@ static PyObject *torrent_replace_trackers(PyObject *self, PyObject *args)
const char* tracker;
if (!PyArg_ParseTuple(args, "iz", &unique_ID, &tracker))
return NULL;
- long index = get_index_from_unique_ID(unique_ID);
- if (PyErr_Occurred())
- return NULL;
try {
+ long index = get_index_from_unique_ID(unique_ID);
+ if (PyErr_Occurred())
+ return NULL;
if (M_torrents->at(index).handle.is_valid()){
std::vector<libtorrent::announce_entry> trackerlist;
std::istringstream trackers(tracker);