From d371225d5d36dcc294fdda40a1b551a986f548a1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 5 May 2011 14:20:51 -0600 Subject: [PATCH 1/3] ... --- src/calibre/gui2/actions/choose_library.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py index f6b19fc4aa..9fd156b802 100644 --- a/src/calibre/gui2/actions/choose_library.py +++ b/src/calibre/gui2/actions/choose_library.py @@ -246,7 +246,8 @@ class ChooseLibraryAction(InterfaceAction): def delete_requested(self, name, location): loc = location.replace('/', os.sep) if not question_dialog(self.gui, _('Are you sure?'), '

'+ - _('All files from

%s

will be ' + _('All files (not just ebooks) ' + 'from

%s

will be ' 'permanently deleted. Are you sure?') % loc, show_copy_button=False): return From 1647e17684a07b29501b4a2ef4bfdd59e989f390 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 5 May 2011 14:34:41 -0600 Subject: [PATCH 2/3] Fix two zero byte files being left behind after calibre quits on windows --- setup/installer/windows/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup/installer/windows/main.c b/setup/installer/windows/main.c index d76850504e..780be94330 100644 --- a/setup/installer/windows/main.c +++ b/setup/installer/windows/main.c @@ -23,6 +23,9 @@ wWinMain(HINSTANCE Inst, HINSTANCE PrevInst, ret = execute_python_entrypoint(BASENAME, MODULE, FUNCTION, stdout_redirect, stderr_redirect); + if (stdout != NULL) fclose(stdout); + if (stderr != NULL) fclose(stderr); + DeleteFile(stdout_redirect); DeleteFile(stderr_redirect); From e277a9218930b9aef5a60a963a45fa070b7c1461 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 5 May 2011 14:44:54 -0600 Subject: [PATCH 3/3] Fix temp file leak when restarting calibre from within itself --- src/calibre/gui2/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index eadfa55549..645ce3b228 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -299,13 +299,13 @@ def run_gui(opts, args, actions, listener, app, gui_debug=None): if getattr(runner.main, 'debug_on_restart', False): run_in_debug_mode() else: + import subprocess print 'Restarting with:', e, sys.argv if hasattr(sys, 'frameworks_dir'): app = os.path.dirname(os.path.dirname(sys.frameworks_dir)) - import subprocess subprocess.Popen('sleep 3s; open '+app, shell=True) else: - os.execvp(e, sys.argv) + subprocess.Popen([e] + sys.argv[1:]) else: if iswindows: try: