better ordering of alerts

1 files changed, 12 insertions, 7 deletions

diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs
index 1c8d122d5..ddbd51655 100644
--- a/Assistant/Threads/Watcher.hs
+++ b/Assistant/Threads/Watcher.hs
@@ -75,13 +75,18 @@ watchThread st dstatus transferqueue changechan = do
 startupScan :: ThreadState -> DaemonStatusHandle -> IO a -> IO a
 startupScan st dstatus scanner = do
 	runThreadState st $ showAction "scanning"
-	r <- alertWhile dstatus startupScanAlert scanner
-	modifyDaemonStatus_ dstatus $ \s -> s { scanComplete = True }
-
-	-- Notice any files that were deleted before watching was started.
-	runThreadState st $ do
-		inRepo $ Git.Command.run "add" [Param "--update"]
-		showAction "started"
+	r <- alertWhile dstatus startupScanAlert $ do
+		r <- scanner
+		modifyDaemonStatus_ dstatus $ \s -> s { scanComplete = True }
+
+		-- Notice any files that were deleted before
+		-- watching was started.
+		runThreadState st $ do
+			inRepo $ Git.Command.run "add" [Param "--update"]
+			showAction "started"
+		return r
+	
+	void $ addAlert dstatus runningAlert
 
 	return r