From 6ec7c4fef49ac4cb58860b86a53664f5015828b4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 17 May 2015 17:26:19 -0400 Subject: [PATCH] webapp: Fix zombie xdg-open process left when opening file browser. Closes: #785498 --- Assistant/WebApp/DashBoard.hs | 5 +++-- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Assistant/WebApp/DashBoard.hs b/Assistant/WebApp/DashBoard.hs index 5e5ea75b94..18ef1ad332 100644 --- a/Assistant/WebApp/DashBoard.hs +++ b/Assistant/WebApp/DashBoard.hs @@ -132,8 +132,9 @@ openFileBrowser = do #endif ifM (liftIO $ inPath cmd) ( do - let run = void $ liftIO $ forkIO $ void $ - createProcess p + let run = void $ liftIO $ forkIO $ do + (Nothing, Nothing, Nothing, pid) <- createProcess p + void $ waitForProcess pid run #ifdef mingw32_HOST_OS {- On windows, if the file browser is not diff --git a/debian/changelog b/debian/changelog index 073581cf47..77477078c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ git-annex (5.20150508.2) UNRELEASED; urgency=medium * unused: Add --used-refspec option and annex.used-refspec, which can specify a set of refs to consider used, rather than the default of considering all refs used. + * webapp: Fix zombie xdg-open process left when opening file browser. + Closes: #785498 -- Joey Hess Mon, 11 May 2015 12:45:06 -0400