summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-30 18:19:24 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-07-30 18:19:24 -0400
commit2e54a611c7610b0b363d01b70536e29a09f4fc65 (patch)
tree29dacbda5aab8051d8aacdf7f47c97f3aa28a881
parente3c60b8f4cfbad202a28ec4f1452f74c68397361 (diff)
parent254c174bba261a14ebd75e9fefae823a8a0f3d88 (diff)
Merge branch 'assistant' into assistant-longpolling-rewrite
-rw-r--r--Assistant/Threads/WebApp.hs7
1 files changed, 3 insertions, 4 deletions
diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs
index 7b96665d3..a9b87ea58 100644
--- a/Assistant/Threads/WebApp.hs
+++ b/Assistant/Threads/WebApp.hs
@@ -164,11 +164,9 @@ transfersDisplay warnNoScript = do
if null transfers
then ifM (lift $ showIntro <$> getWebAppState)
( introDisplay ident
- , noop
+ , $(widgetFile "transfers")
)
- else do
- lift $ modifyWebAppState $ \s -> s { showIntro = False }
- $(widgetFile "transfers")
+ else $(widgetFile "transfers")
transfersDisplayIdent :: Text
transfersDisplayIdent = "transfers"
@@ -189,6 +187,7 @@ introDisplay ident = do
let barelyenough = n == 2
let morethanenough = n > 2
$(widgetFile "intro")
+ lift $ modifyWebAppState $ \s -> s { showIntro = False }
where
counter = map show ([1..] :: [Int])