From 72b25b61e9c91668e0c05a17c50462b822885eb8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 3 Apr 2013 17:44:34 -0400
Subject: clean up urlrenderer handling when the webapp is not built

---
 Assistant.hs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'Assistant.hs')

diff --git a/Assistant.hs b/Assistant.hs
index ba2916fbf..a436070b3 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -154,6 +154,7 @@ import Assistant.Threads.XMPPClient
 #warning Building without the webapp. You probably need to install Yesod..
 #endif
 import Assistant.Environment
+import Assistant.Types.UrlRenderer
 import qualified Utility.Daemon
 import Utility.LogFile
 import Utility.ThreadScheduler
@@ -205,15 +206,16 @@ startDaemon assistant foreground startbrowser = do
 			flip runAssistant (go webappwaiter) 
 				=<< newAssistantData st dstatus
 
-	go webappwaiter = do
-		notice ["starting", desc, "version", SysConfig.packageversion]
+
 #ifdef WITH_WEBAPP
+	go webappwaiter = do
 		d <- getAssistant id
-		urlrenderer <- liftIO newUrlRenderer
-		mapM_ (startthread $ Just urlrenderer)
 #else
-		mapM_ (startthread Nothing)
+	go _webappwaiter = do
 #endif
+		notice ["starting", desc, "version", SysConfig.packageversion]
+		urlrenderer <- liftIO newUrlRenderer
+		mapM_ (startthread urlrenderer)
 			[ watch $ commitThread
 #ifdef WITH_WEBAPP
 			, assist $ webAppThread d urlrenderer False Nothing webappwaiter
-- 
cgit v1.2.3