Allure 0.8.1.1 → 0.8.1.2
raw patch · 4 files changed
+12/−5 lines, 4 files
Files
- Allure.cabal +1/−1
- CHANGELOG.md +5/−0
- GameDefinition/Implementation/MonadServerImplementation.hs +1/−1
- GameDefinition/Main.hs +5/−3
Allure.cabal view
@@ -5,7 +5,7 @@ -- PVP summary:+-+------- breaking API changes -- | | +----- minor or non-breaking API additions -- | | | +--- code changes with no API change-version: 0.8.1.1+version: 0.8.1.2 synopsis: Near-future Sci-Fi roguelike and tactical squad game description: Allure of the Stars is a near-future Sci-Fi roguelike and tactical squad game. Binaries and the game manual
CHANGELOG.md view
@@ -1,3 +1,8 @@+## [v0.8.1.2](https://github.com/AllureOfTheStars/Allure/compare/v0.8.1.1...v0.8.1.2)++- Fix typos detected by lintian+- Fix the code that runs in case of old async (bug introduced in v0.8.1.1)+ ## [v0.8.1.1](https://github.com/AllureOfTheStars/Allure/v0.8.1.0...v0.8.1.1) - no player-visible changes
GameDefinition/Implementation/MonadServerImplementation.hs view
@@ -185,7 +185,7 @@ -- Wait for clients to exit even in case of server crash -- (or server and client crash), which gives them time to save -- and report their own inconsistencies, if any.- Ex.handle (\(ex :: Ex.SomeException) -> case Ex.fromException ex of+ Ex.handle (\ex -> case Ex.fromException ex of Just ExitSuccess -> -- User-forced shutdown, not crash, so the intention is -- to keep old saves and also clients may be not ready to save.
GameDefinition/Main.hs view
@@ -54,11 +54,13 @@ -- Avoid the bound thread that would slow down the communication. a <- async $ tieKnot serverOptions resOrEx <- waitCatch a- let unwrapEx e = case Ex.fromException e of+ let unwrapEx e = #if MIN_VERSION_async(2,2,1)- Just (ExceptionInLinkedThread _ ex) -> unwrapEx ex+ case Ex.fromException e of+ Just (ExceptionInLinkedThread _ ex) -> unwrapEx ex+ _ -> #endif- _ -> e+ e case resOrEx of Right () -> return () Left e -> case Ex.fromException $ unwrapEx e of