|
|
6074d15 |
diff -uNr calibre.old/src/calibre/gui2/ui.py calibre/src/calibre/gui2/ui.py
|
|
|
ac1043e |
--- calibre.old/src/calibre/gui2/ui.py 2011-12-30 17:12:37.909499254 +0100
|
|
|
ac1043e |
+++ calibre/src/calibre/gui2/ui.py 2011-12-30 17:14:33.899450513 +0100
|
|
|
ac1043e |
@@ -681,7 +681,8 @@
|
|
|
6074d15 |
if write_settings:
|
|
|
6074d15 |
self.write_settings()
|
|
|
6074d15 |
self.check_messages_timer.stop()
|
|
|
6074d15 |
- self.update_checker.terminate()
|
|
|
ac1043e |
+ if self.update_checker:
|
|
|
ac1043e |
+ self.update_checker.terminate()
|
|
|
6074d15 |
self.listener.close()
|
|
|
6074d15 |
self.job_manager.server.close()
|
|
|
c7176a1 |
self.job_manager.threaded_server.close()
|
|
|
6074d15 |
diff -uNr calibre.old/src/calibre/gui2/update.py calibre/src/calibre/gui2/update.py
|
|
|
ac1043e |
--- calibre.old/src/calibre/gui2/update.py 2011-12-30 17:12:37.910499245 +0100
|
|
|
ac1043e |
+++ calibre/src/calibre/gui2/update.py 2011-12-30 17:14:11.307655638 +0100
|
|
|
ac1043e |
@@ -122,11 +122,11 @@
|
|
|
3e00138 |
|
|
|
ac1043e |
def __init__(self, opts):
|
|
|
ac1043e |
self.last_newest_calibre_version = NO_CALIBRE_UPDATE
|
|
Ionuț Arțăriși |
c3c738d |
- if not opts.no_update_check:
|
|
Ionuț Arțăriși |
c76318b |
- self.update_checker = CheckForUpdates(self)
|
|
|
d4b7b81 |
- self.update_checker.update_found.connect(self.update_found,
|
|
|
d4b7b81 |
- type=Qt.QueuedConnection)
|
|
|
d4b7b81 |
- self.update_checker.start()
|
|
|
d4b7b81 |
+ #if not opts.no_update_check:
|
|
|
d4b7b81 |
+ # self.update_checker = CheckForUpdates(self)
|
|
|
d4b7b81 |
+ # self.update_checker.update_found.connect(self.update_found,
|
|
|
d4b7b81 |
+ # type=Qt.QueuedConnection)
|
|
|
d4b7b81 |
+ # self.update_checker.start()
|
|
|
3e00138 |
|
|
|
c7176a1 |
def recalc_update_label(self, number_of_plugin_updates):
|
|
|
c7176a1 |
self.update_found('%s%s%d'%(self.last_newest_calibre_version, VSEP,
|