Fix scenario menu update after quitting to menu #1243
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kostmo
changed the title
kostmo
commented
May 3, 2023
| @@ -454,56 +454,81 @@ getNormalizedCurrentScenarioPath = | |||
| gs <- use $ gameState . scenarios | |||
| Just <$> liftIO (normalizeScenarioPath gs p') | |||
|
|
|||
| saveScenarioInfoOnFinish :: (MonadIO m, MonadState AppState m) => FilePath -> m (Maybe ScenarioInfo) | |||
| saveScenarioInfoOnFinish p = do | |||
There was a problem hiding this comment.
This is just a cut-and-paste of the body of saveScenarioInfoOnFinishNocheat (formerly saveScenarioInfoOnFinish).
kostmo
commented
May 3, 2023
|
|
||
| -- | Write the @ScenarioInfo@ out to disk when exiting a game. | ||
| saveScenarioInfoOnQuit :: (MonadIO m, MonadState AppState m) => m () | ||
| saveScenarioInfoOnQuit = do | ||
| saveScenarioInfoOnFinish |
There was a problem hiding this comment.
This function call is moved 8 lines down to make use of the "cheat" check, which was formerly implemented redundantly.
kostmo
force-pushed
the
scenario-menu-bugfix
branch
from
b52a32e
to
d6df551
Compare
kostmo
force-pushed
the
scenario-menu-bugfix
branch
from
d6df551
to
2d8c191
Compare
byorgey
approved these changes
May 3, 2023
mergify bot
pushed a commit
that referenced
this pull request
Jun 5, 2023
I believe that since #1277 the progress has not been saved when exiting a scenario back to the menu. It is because `getNormalizedCurrentScenarioPath`, which is utilized by `saveScenarioInfoOnQuit`, was returning `Nothing`, in turn because `currentScenarioPath` was `Nothing`. This is because `scenarioToAppState` was clearing it immediately after being set inside `startGameWithSeed`. Foreshadowed by this comment: #1243 (review) .
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ensures that the "played" status and the "best scores" get updated in the scenario menu after "Quit to menu" is selected from within a scenario.
This bug appeared after merging #974.