summaryrefslogtreecommitdiff
path: root/src/Utility/ThreadScheduler.hs
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2015-01-15 14:03:50 -0400
committerJoey Hess <joeyh@joeyh.name>2015-01-15 14:03:50 -0400
commit47fdb99fbba21f724a2cb6e909c3801e3cc7ab22 (patch)
tree6b97363e81def50d20a1e5aefb6a2a2519bfdcfa /src/Utility/ThreadScheduler.hs
parent16031a7c26464485e7c11afdec7d0b80dfe2f5bf (diff)
parent35cd06e4e6cad5bc6c9bbbd33642450dbd2de10c (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'src/Utility/ThreadScheduler.hs')
-rw-r--r--src/Utility/ThreadScheduler.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Utility/ThreadScheduler.hs b/src/Utility/ThreadScheduler.hs
index eb009742..e6a81aeb 100644
--- a/src/Utility/ThreadScheduler.hs
+++ b/src/Utility/ThreadScheduler.hs
@@ -1,6 +1,6 @@
{- thread scheduling
-
- - Copyright 2012, 2013 Joey Hess <id@joeyh.name>
+ - Copyright 2012, 2013 Joey Hess <joey@kitenet.net>
- Copyright 2011 Bas van Dijk & Roel van Dijk
-
- License: BSD-2-clause
@@ -57,8 +57,7 @@ unboundDelay time = do
waitForTermination :: IO ()
waitForTermination = do
#ifdef mingw32_HOST_OS
- runEvery (Seconds 600) $
- void getLine
+ forever $ threadDelaySeconds (Seconds 6000)
#else
lock <- newEmptyMVar
let check sig = void $