mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-15 23:08:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Catch and log ReactorNotRunning when stopping reactor in gtk

Browse source
This commit is contained in:
Calum Lind 2012-02-19 16:44:12 +00:00
commit 7847362dbb
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
deluge/ui/gtkui/gtkui.py
View file

@ -289,7 +289,7 @@ class GtkUI(object):
def on_dialog_response(response): def on_dialog_response(response):
if response != gtk.RESPONSE_YES: if response != gtk.RESPONSE_YES:
# The user does not want to turn Classic Mode off, so just quit # The user does not want to turn Classic Mode off, so just quit
reactor.stop() self.mainwindow.quit()
return return
# Turning off classic_mode # Turning off classic_mode
self.config["classic_mode"] = False self.config["classic_mode"] = False

2
deluge/ui/gtkui/ipcinterface.py
View file

@ -151,7 +151,7 @@ class IPCInterface(component.Component):
def connect_failed(self, args): def connect_failed(self, args):
# This gets called when we're unable to do a connectUNIX to the ipc # This gets called when we're unable to do a connectUNIX to the ipc
# socket. We'll delete the lock and socket files and start up Deluge. # socket. We'll delete the lock and socket files and start up Deluge.
#reactor.stop()
socket = os.path.join(deluge.configmanager.get_config_dir("ipc"), "deluge-gtk") socket = os.path.join(deluge.configmanager.get_config_dir("ipc"), "deluge-gtk")
if os.path.exists(socket): if os.path.exists(socket):
try: try:

6
deluge/ui/gtkui/mainwindow.py
View file

@ -45,6 +45,7 @@ import deluge.component as component
from deluge.configmanager import ConfigManager from deluge.configmanager import ConfigManager
from deluge.ui.gtkui.ipcinterface import process_args from deluge.ui.gtkui.ipcinterface import process_args
from twisted.internet import reactor, defer from twisted.internet import reactor, defer
from twisted.internet.error import ReactorNotRunning
import deluge.common import deluge.common
import common import common
@ -165,7 +166,10 @@ class MainWindow(component.Component):
return client.disconnect() return client.disconnect()
def stop_reactor(result): def stop_reactor(result):
return reactor.stop() try:
reactor.stop()
except ReactorNotRunning:
log.debug("Attempted to stop the reactor but it is not running...")
def log_failure(failure, action): def log_failure(failure, action):
log.error("Encountered error attempting to %s: %s" % \ log.error("Encountered error attempting to %s: %s" % \