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

Possible fix for restarting on windows home not working

Browse Source
This commit is contained in:
Kovid Goyal 2017-06-23 18:01:40 +05:30
parent 8e510d3290
commit a6379abb17
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/gui2/main.py
View File

@ -402,6 +402,7 @@ def run_gui(opts, args, listener, app, gui_debug=None):
prints('Restarting with:', app) prints('Restarting with:', app)
subprocess.Popen('sleep 3s; open ' + shellquote(app), shell=True) subprocess.Popen('sleep 3s; open ' + shellquote(app), shell=True)
else: else:
os.environ[b'CALIBRE_RESTARTING_FROM_GUI'] = b'1'
if iswindows and hasattr(winutil, 'prepare_for_restart'): if iswindows and hasattr(winutil, 'prepare_for_restart'):
winutil.prepare_for_restart() winutil.prepare_for_restart()
args = ['-g'] if os.path.splitext(e)[0].endswith('-debug') else [] args = ['-g'] if os.path.splitext(e)[0].endswith('-debug') else []
@ -505,6 +506,8 @@ def create_listener():
def main(args=sys.argv): def main(args=sys.argv):
if os.environ.pop(b'CALIBRE_RESTARTING_FROM_GUI', None) == b'1':
time.sleep(2) # give the parent process time to cleanup and close
if iswindows and 'CALIBRE_REPAIR_CORRUPTED_DB' in os.environ: if iswindows and 'CALIBRE_REPAIR_CORRUPTED_DB' in os.environ:
windows_repair() windows_repair()
return 0 return 0