1 files changed, 4 insertions, 4 deletions

diff --git a/Presence/ConsoleWriter.hs b/Presence/ConsoleWriter.hs
index e755b27f..986294f4 100644
--- a/Presence/ConsoleWriter.hs
+++ b/Presence/ConsoleWriter.hs
@@ -17,7 +17,6 @@ import Data.Monoid
 import Data.Char
 import Data.Maybe
 import System.Environment hiding (setEnv)
-import System.Process ( rawSystem )
 import System.Exit ( ExitCode(ExitSuccess) )
 import System.Posix.Env     ( setEnv )
 import System.Posix.Process ( forkProcess, exitImmediately, executeFile )
@@ -36,7 +35,7 @@ import qualified Data.Text as Text
 import qualified Network.BSD as BSD
 
 import UTmp           ( users2, utmp_file, UtmpRecord(..), UT_Type(..) )
-import FGConsole      ( monitorTTY )
+import FGConsole      ( forkTTYMonitor )
 import XMPPServer     ( Stanza, makePresenceStanza, JabberShow(..), stanzaType
                       , LangSpecificMessage(..), msgLangMap, cloneStanza, stanzaFrom )
 import ControlMaybe   ( handleIO_ )
@@ -109,7 +108,7 @@ onLogin cs start = \e -> do
 -- | Sets up threads to monitor tty switches and logins that are
 -- written to the system utmp file and returns a 'ConsoleWriter'
 -- object for interacting with that information.
-newConsoleWriter :: IO ConsoleWriter
+newConsoleWriter :: IO (Maybe ConsoleWriter)
 newConsoleWriter = do
     chan <- atomically $ newEmptyTMVar
     cs <- atomically $ do
@@ -136,7 +135,8 @@ newConsoleWriter = do
     inotify <- initINotify
 
     -- get active tty
-    mtty <- monitorTTY (onTTY outvar cs)
+    mtty <- forkTTYMonitor (onTTY outvar cs)
+    forM mtty $ \_ -> do
     atomically $ retryWhen (readTVar $ csActiveTTY cs) (==0)
 
     -- read utmp