From 60e8690e6e8cbab64e87b64465d18e64a09cde85 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 12 Aug 2015 11:48:53 +0530 Subject: [PATCH] Fix stopping content server message not being dismissable --- src/calibre/gui2/actions/device.py | 7 +++---- src/calibre/gui2/preferences/server.py | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py index 27835a7406..7baa8e62d9 100644 --- a/src/calibre/gui2/actions/device.py +++ b/src/calibre/gui2/actions/device.py @@ -235,12 +235,11 @@ class ConnectShareAction(InterfaceAction): _('Stopping server, this could take upto a minute, please wait...'), show_copy_button=False) QTimer.singleShot(1000, self.check_exited) + self.stopping_msg.exec_() def check_exited(self): - if self.gui.content_server.is_running: - QTimer.singleShot(20, self.check_exited) - if not self.stopping_msg.isVisible(): - self.stopping_msg.exec_() + if getattr(self.gui.content_server, 'is_running', False): + QTimer.singleShot(50, self.check_exited) return self.gui.content_server = None self.stopping_msg.accept() diff --git a/src/calibre/gui2/preferences/server.py b/src/calibre/gui2/preferences/server.py index 6b616971bc..2ae5cddb38 100644 --- a/src/calibre/gui2/preferences/server.py +++ b/src/calibre/gui2/preferences/server.py @@ -85,12 +85,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): _('Stopping server, this could take upto a minute, please wait...'), show_copy_button=False) QTimer.singleShot(500, self.check_exited) + self.stopping_msg.exec_() 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) - if not self.stopping_msg.isVisible(): - self.stopping_msg.exec_() return self.gui.content_server = None