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

Fix restarting not working on windows when using calibre-debug.exe -g

Browse Source
This commit is contained in:
Kovid Goyal 2021-07-28 16:08:20 +05:30
parent 96d5d5a764
commit 480f1e5b48
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -486,7 +486,9 @@ def communicate(opts, args):
def restart_after_quit(): def restart_after_quit():
if iswindows: e = sys.executable if getattr(sys, 'frozen', False) else sys.argv[0]
is_calibre_debug_exe = os.path.splitext(e)[0].endswith('-debug')
if iswindows and not is_calibre_debug_exe:
# detach the stdout/stderr/stdin handles # detach the stdout/stderr/stdin handles
winutil.prepare_for_restart() winutil.prepare_for_restart()
if after_quit_actions['debug_on_restart']: if after_quit_actions['debug_on_restart']:
@ -506,9 +508,8 @@ def restart_after_quit():
else: else:
cmd.append('calibre') cmd.append('calibre')
else: else:
e = sys.executable if getattr(sys, 'frozen', False) else sys.argv[0]
cmd = [e] cmd = [e]
if os.path.splitext(e)[0].endswith('-debug'): if is_calibre_debug_exe:
cmd.append('-g') cmd.append('-g')
prints('Restarting with:', ' '.join(cmd)) prints('Restarting with:', ' '.join(cmd))
subprocess.Popen(cmd) subprocess.Popen(cmd)