From aacd5c6994aa6d8e6c4be83f1406642816c0621d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 16 Jul 2014 15:42:12 -0400 Subject: [PATCH] Windows: fix crash after 10 minutes getLine in waitForTermination doesn't work when stdin is closed.. Just loop forever, there was no reason to getLine here I think. --- Utility/ThreadScheduler.hs | 3 +-- doc/bugs/Windows_daemon_silently_dies.mdwn | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Utility/ThreadScheduler.hs b/Utility/ThreadScheduler.hs index fc026d7e64..104032c152 100644 --- a/Utility/ThreadScheduler.hs +++ b/Utility/ThreadScheduler.hs @@ -57,8 +57,7 @@ unboundDelay time = do waitForTermination :: IO () waitForTermination = do #ifdef mingw32_HOST_OS - runEvery (Seconds 600) $ - void getLine + forever $ threadDelaySeconds (Seconds 6) #else lock <- newEmptyMVar let check sig = void $ diff --git a/doc/bugs/Windows_daemon_silently_dies.mdwn b/doc/bugs/Windows_daemon_silently_dies.mdwn index f336a4a4c5..cbffc0083d 100644 --- a/doc/bugs/Windows_daemon_silently_dies.mdwn +++ b/doc/bugs/Windows_daemon_silently_dies.mdwn @@ -128,3 +128,5 @@ git-annex: assistant: 1 failed """]] [[!tag confirmed]] + +> [[fixed|done]] --[[Joey]]