summaryrefslogtreecommitdiff
path: root/Assistant/NamedThread.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-23 00:54:08 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-23 00:54:08 -0400
commitec8edd25c6917ad10dc129bbaebffdd50afe0d51 (patch)
treedb756010017cc771c0045db8dab988cef49b6295 /Assistant/NamedThread.hs
parent6b770f7797588e687ef5b4e567d86a0fd08809ea (diff)
restart on upgrade is working, including automatic restart
Made alerts be able to have multiple buttons, so the alerts about upgrading can have a button that enables automatic upgrades. Implemented automatic upgrading when the program file has changed. Note that when an automatic upgrade happens, the webapp displays an alert about it for a few minutes, and then closes. This still needs work.
Diffstat (limited to 'Assistant/NamedThread.hs')
-rw-r--r--Assistant/NamedThread.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/NamedThread.hs b/Assistant/NamedThread.hs
index 2440c45bf..e1b3983f7 100644
--- a/Assistant/NamedThread.hs
+++ b/Assistant/NamedThread.hs
@@ -82,7 +82,7 @@ startNamedThread urlrenderer (NamedThread afterstartupsanitycheck name a) = do
(RestartThreadR name)
runAssistant d $ void $ addAlert $
(warningAlert (fromThreadName name) msg)
- { alertButton = Just button }
+ { alertButtons = [button] }
#endif
namedThreadId :: NamedThread -> Assistant (Maybe ThreadId)