Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2025-12-23 18:54:42 +01:00
Code Issues Projects Releases Wiki Activity

...

Browse source
This commit is contained in:
Kovid Goyal 2020-10-16 18:24:28 +05:30
parent 24a6174362
commit 2b38f42c7d
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/calibre/gui2/main.py
View file

@ -355,7 +355,7 @@ def initialize(self, *args):
def set_restarting_env_var():
if iswindows:
ctime = plugins['winutil'][0].get_process_times(None)[0]
ctime = winutil.get_process_times(None)[0]
os.environ['CALIBRE_RESTARTING_FROM_GUI'] = str(ctime)
else:
os.environ['CALIBRE_RESTARTING_FROM_GUI'] = str(os.getpid())
@ -525,11 +525,10 @@ def create_listener():
def wait_for_parent_to_die(ppid, max_wait=10):
ppid = int(ppid)
if iswindows:
get_process_times = plugins['winutil'][0].get_process_times
def parent_done():
try:
ctime = get_process_times(os.getppid())[0]
ctime = winutil.get_process_times(os.getppid())[0]
except Exception:
return True
return ctime > ppid