wait on TMVar instead of using getLine

1 files changed, 7 insertions, 3 deletions

diff --git a/Presence/main.hs b/Presence/main.hs
index 9d359292..db1a7445 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -801,7 +801,7 @@ start ip4or6 = do
     remotes <- forkIO $ seekRemotePeers (PeerSessions global_state) chan (remotePeers global_state)
 
     installHandler sigUSR1 (Catch (dologin (userError "signaled"))) Nothing
-    -- installHandler sigTERM (CatchOnce (dologin (userError "term signaled"))) Nothing
+
     mtty <- monitorTTY (on_chvt global_state)
     inotify <- initINotify
 #ifndef NOUTMP
@@ -816,8 +816,12 @@ start ip4or6 = do
 
     threadDelay 1000 -- wait a moment to obtain current tty
     dologin ()
-    L.putStrLn "\nHit enter to terminate...\n"
-    getLine
+    -- L.putStrLn "\nHit enter to terminate...\n"
+    quitVar <- newEmptyTMVarIO
+    installHandler sigTERM (CatchOnce (atomically $ putTMVar quitVar True)) Nothing
+    quitMessage <- atomically $ takeTMVar quitVar
+    -- getLine
+
     killThread remotes
     quitListening clients
     quitListening peers