summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-07-16 15:42:12 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-07-16 15:42:12 -0400
commit8553b30c98af907fbdac6bec74f80ab097a67b09 (patch)
tree4b5902ced4388c68ae6b04efa1fa73d874fb3190
parentf1e2d1733e2441e702303ae22f8f926834d5c410 (diff)
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.
-rw-r--r--Utility/ThreadScheduler.hs3
-rw-r--r--doc/bugs/Windows_daemon_silently_dies.mdwn2
2 files changed, 3 insertions, 2 deletions
diff --git a/Utility/ThreadScheduler.hs b/Utility/ThreadScheduler.hs
index fc026d7e6..104032c15 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 f336a4a4c..cbffc0083 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]]