0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix difficulty dialog not showing when loading from within a game (bug #24925)

Browse source 
This also removes a now-superfluous check in show_difficulty_dialog(), since the state of the
difficulty checkbox is handled within the dialog
This commit is contained in:
Charles Dang 2016-08-06 09:32:35 +11:00
parent feb64ddbfe
commit 7fae63e471
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/savegame.cpp
View file

@ -120,7 +120,7 @@ void loadgame::show_dialog()
void loadgame::show_difficulty_dialog()
{
if(summary_["corrupt"].to_bool() || (is_replay_save(summary_)) || (!summary_["turn"].empty())) {
if(summary_["corrupt"].to_bool()) {
return;
}
@ -159,9 +159,11 @@ bool loadgame::load_game()
return false;
}
if (select_difficulty_)
show_difficulty_dialog();
// Confirm the integrity of the file before throwing the exception.
// Use the summary in the save_index for this.
const config & summary = save_index_manager.get(filename_);
if (summary["corrupt"].to_bool(false)) {