codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tweak try/catch again

This commit is contained in:
Marcos Pinto 2007-11-26 17:03:04 +00:00
parent 8c5355498c
commit d288e39a54
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/deluge_core.cpp
View File

@ -182,10 +182,10 @@ long get_torrent_index(torrent_handle &handle)
long get_index_from_unique_ID(long unique_ID) long get_index_from_unique_ID(long unique_ID)
{ {
try{ try{
for (unsigned long i = 0; i < M_torrents->size(); i++) for (unsigned long i = 0; i < M_torrents->size(); i++)
if ((*M_torrents)[i].unique_ID == unique_ID) if ((*M_torrents)[i].unique_ID == unique_ID)
return i; return i;
RAISE_INT(DelugeError, "No such unique_ID."); RAISE_INT(DelugeError, "No such unique_ID.");
} }
catch(invalid_handle&) catch(invalid_handle&)
{ {
@ -1802,11 +1802,11 @@ static PyObject *torrent_replace_trackers(PyObject *self, PyObject *args)
const char* tracker; const char* tracker;
if (!PyArg_ParseTuple(args, "iz", &unique_ID, &tracker)) if (!PyArg_ParseTuple(args, "iz", &unique_ID, &tracker))
return NULL; return NULL;
long index = get_index_from_unique_ID(unique_ID);
if (PyErr_Occurred())
return NULL;
try { try {
long index = get_index_from_unique_ID(unique_ID);
if (PyErr_Occurred())
return NULL;
if (M_torrents->at(index).handle.is_valid()){ if (M_torrents->at(index).handle.is_valid()){
std::vector<libtorrent::announce_entry> trackerlist; std::vector<libtorrent::announce_entry> trackerlist;
std::istringstream trackers(tracker); std::istringstream trackers(tracker);