summaryrefslogtreecommitdiff
path: root/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-11-05 19:39:08 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-11-05 19:39:08 -0400
commitd61d6e1f8ae90cb5babbe1334bc7fd13c4eb90eb (patch)
treed8c81de580907c1c09284409f803cfdf56795958 /Assistant.hs
parentb3d1a85c2068d42d5399fa659dc94735664da579 (diff)
better handling of lifting from XMPP -> Assistant
Diffstat (limited to 'Assistant.hs')
-rw-r--r--Assistant.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/Assistant.hs b/Assistant.hs
index 5cc9f303f..4a21a2ae9 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -177,7 +177,7 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do
checkCanWatch
dstatus <- startDaemonStatus
liftIO $ daemonize $
- runAssistant go =<< newAssistantData st dstatus
+ flip runAssistant go =<< newAssistantData st dstatus
where
go = do
d <- getAssistant id
@@ -216,6 +216,5 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do
assist a = (False, a)
startthread d (watcher, t)
| watcher || assistant = void $ liftIO $ forkIO $
- flip runAssistant d $
- runNamedThread t
+ runAssistant d $ runNamedThread t
| otherwise = noop