diff options
| -rw-r--r-- | Messages/Concurrent.hs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Messages/Concurrent.hs b/Messages/Concurrent.hs index bb949af03..5b125a97f 100644 --- a/Messages/Concurrent.hs +++ b/Messages/Concurrent.hs @@ -43,7 +43,12 @@ concurrentMessage iserror msg _ = go =<< consoleRegion <$> Annex.getState Annex. when iserror $ do Annex.changeState $ \s -> s { Annex.output = (Annex.output s) { consoleRegionErrFlag = True } } - liftIO $ Regions.appendConsoleRegion r msg + liftIO $ atomically $ do + Regions.appendConsoleRegion r msg + rl <- takeTMVar Regions.regionList + putTMVar Regions.regionList + (if r `elem` rl then rl else r:rl) + #else concurrentMessage _ _ fallback = fallback #endif @@ -73,7 +78,10 @@ inOwnConsoleRegion a = do rmregion r return ret where - mkregion = Regions.openConsoleRegion Regions.Linear + -- The region is allocated here, but not displayed until + -- a message is added to it. This avoids unnecessary screen + -- updates when a region does not turn out to need to be used. + mkregion = Regions.newConsoleRegion Regions.Linear "" setregion r = Annex.changeState $ \s -> s { Annex.output = (Annex.output s) { consoleRegion = r } } rmregion r = do errflag <- consoleRegionErrFlag <$> Annex.getState Annex.output |