codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-01-27 03:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multiuser

Browse Source
This commit is contained in:
Andrew Resch 2010-08-21 13:00:47 -07:00
commit dee33745c8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deluge/config.py
View File

@ -398,7 +398,7 @@ what is currently in the config and it could not convert the value
loaded_data = json.loads(data[start:end])
if self.__config == loaded_data and self.__version == version:
# The config has not changed so lets just return
if self._save_timer:
if self._save_timer and self._save_timer.active():
self._save_timer.cancel()
return
except IOError, e:

2
deluge/ui/sessionproxy.py
View File

@ -241,9 +241,9 @@ class SessionProxy(component.Component):
def on_torrent_added(self, torrent_id):
self.torrents[torrent_id] = [time.time() - self.cache_time - 1, {}]
self.cache_times[torrent_id] = {}
def on_status(status):
self.torrents[torrent_id][1].update(status)
self.cache_times[torrent_id] = {}
t = time.time()
for key in status:
self.cache_times[torrent_id][key] = t