mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix build with webapp disabled

Browse source 
Broken by recent thread manager and restarting improvements.
This commit is contained in:
Joey Hess 2013-02-06 15:38:41 -04:00
parent b1de99c1d4
commit 937cf81873
2 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Assistant.hs
View file

@ -196,8 +196,10 @@ startDaemon assistant foreground startbrowser = do
#ifdef WITH_WEBAPP
d <- getAssistant id
urlrenderer <- liftIO newUrlRenderer
mapM_ (startthread $ Just urlrenderer)
#else
mapM_ (startthread Nothing)
#endif
mapM_ (startthread urlrenderer)
[ watch $ commitThread
#ifdef WITH_WEBAPP
, assist $ webAppThread d urlrenderer False Nothing webappwaiter
@ -230,5 +232,5 @@ startDaemon assistant foreground startbrowser = do
watch a = (True, a)
assist a = (False, a)
startthread urlrenderer (watcher, t)
| watcher || assistant = startNamedThread (Just urlrenderer) t
| watcher || assistant = startNamedThread urlrenderer t
| otherwise = noop