Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix stopping content server message not being dismissable

Browse Source
This commit is contained in:
Kovid Goyal 2015-08-12 11:48:53 +05:30
parent 33f926a8d6
commit 60e8690e6e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/gui2/actions/device.py
View File

@ -235,12 +235,11 @@ class ConnectShareAction(InterfaceAction):
_('Stopping server, this could take upto a minute, please wait...'), _('Stopping server, this could take upto a minute, please wait...'),
show_copy_button=False) show_copy_button=False)
QTimer.singleShot(1000, self.check_exited) QTimer.singleShot(1000, self.check_exited)
self.stopping_msg.exec_()
def check_exited(self): def check_exited(self):
if self.gui.content_server.is_running: if getattr(self.gui.content_server, 'is_running', False):
QTimer.singleShot(20, self.check_exited) QTimer.singleShot(50, self.check_exited)
if not self.stopping_msg.isVisible():
self.stopping_msg.exec_()
return return
self.gui.content_server = None self.gui.content_server = None
self.stopping_msg.accept() self.stopping_msg.accept()

5
src/calibre/gui2/preferences/server.py
View File

@ -85,12 +85,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
_('Stopping server, this could take upto a minute, please wait...'), _('Stopping server, this could take upto a minute, please wait...'),
show_copy_button=False) show_copy_button=False)
QTimer.singleShot(500, self.check_exited) QTimer.singleShot(500, self.check_exited)
self.stopping_msg.exec_()
def check_exited(self): def check_exited(self):
if self.gui.content_server.is_running: if getattr(self.gui.content_server, 'is_running', False):
QTimer.singleShot(20, self.check_exited) QTimer.singleShot(20, self.check_exited)
if not self.stopping_msg.isVisible():
self.stopping_msg.exec_()
return return
self.gui.content_server = None self.gui.content_server = None