webapp: Improved alerts displayed when syncing with remotes, and when syncing with a remote fails.

1 files changed, 7 insertions, 10 deletions

diff --git a/Assistant/Threads/TransferScanner.hs b/Assistant/Threads/TransferScanner.hs
index d4ccf411a..d328ba197 100644
--- a/Assistant/Threads/TransferScanner.hs
+++ b/Assistant/Threads/TransferScanner.hs
@@ -12,7 +12,6 @@ import Assistant.Types.ScanRemotes
 import Assistant.ScanRemotes
 import Assistant.TransferQueue
 import Assistant.DaemonStatus
-import Assistant.Alert
 import Assistant.Drop
 import Assistant.Sync
 import Logs.Transfer
@@ -100,15 +99,13 @@ failedTransferScan r = do
 expensiveScan :: [Remote] -> Assistant ()
 expensiveScan rs = unless onlyweb $ do
 	debug ["starting scan of", show visiblers]
-	void $ alertWhile (scanAlert visiblers) $ do
-		g <- liftAnnex gitRepo
-		(files, cleanup) <- liftIO $ LsFiles.inRepo [] g
-		forM_ files $ \f -> do
-			ts <- maybe (return []) (findtransfers f)
-				=<< liftAnnex (Backend.lookupFile f)
-			mapM_ (enqueue f) ts
-		void $ liftIO cleanup
-		return True
+	g <- liftAnnex gitRepo
+	(files, cleanup) <- liftIO $ LsFiles.inRepo [] g
+	forM_ files $ \f -> do
+		ts <- maybe (return []) (findtransfers f)
+			=<< liftAnnex (Backend.lookupFile f)
+		mapM_ (enqueue f) ts
+	void $ liftIO cleanup
 	debug ["finished scan of", show visiblers]
   where
 	onlyweb = all (== webUUID) $ map Remote.uuid rs