summaryrefslogtreecommitdiff
path: root/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-31 12:17:31 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-07-31 12:17:31 -0400
commit04794eafc0f0fd09e645247136fe557fd80bfb55 (patch)
tree92ca3260821cdc99c0d47907765ee862c6d23782 /Assistant.hs
parentb9b009787662cda4948b3c9706b8897587d05d8a (diff)
webapp now starts up when run not in a git repo
Diffstat (limited to 'Assistant.hs')
-rw-r--r--Assistant.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant.hs b/Assistant.hs
index 22a87fe8c..4bb85975b 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -122,7 +122,7 @@ import Utility.ThreadScheduler
import Control.Concurrent
-startDaemon :: Bool -> Bool -> Maybe (IO ()) -> Annex ()
+startDaemon :: Bool -> Bool -> Maybe (FilePath -> IO ()) -> Annex ()
startDaemon assistant foreground webappwaiter
| foreground = do
showStart (if assistant then "assistant" else "watch") "."
@@ -155,7 +155,7 @@ startDaemon assistant foreground webappwaiter
, mountWatcherThread st dstatus scanremotes
, transferScannerThread st dstatus scanremotes transferqueue
#ifdef WITH_WEBAPP
- , webAppThread st dstatus transferqueue webappwaiter
+ , webAppThread (Just st) dstatus transferqueue webappwaiter
#endif
, watchThread st dstatus transferqueue changechan
]