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

Game Load: The dialog shall be usable even if the auto-selected savefile is invalid.

Browse source 
See #3647.
This commit is contained in:
josteph 2018-10-23 23:32:02 +00:00
parent 2f266dde90
commit 3dc3428e62
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/gui/dialogs/game_load.cpp
View file

@ -45,6 +45,12 @@
#include <cctype>
#include "utils/functional.hpp"
static lg::log_domain log_gameloaddlg{"gui/dialogs/game_load_dialog"};
#define ERR_GAMELOADDLG LOG_STREAM(err, log_gameloaddlg)
#define WRN_GAMELOADDLG LOG_STREAM(warn, log_gameloaddlg)
#define LOG_GAMELOADDLG LOG_STREAM(info, log_gameloaddlg)
#define DBG_GAMELOADDLG LOG_STREAM(debug, log_gameloaddlg)
namespace gui2
{
namespace dialogs
@ -153,7 +159,7 @@ void game_load::pre_show(window& window)
display_savegame(window);
}
void game_load::display_savegame(window& window)
void game_load::display_savegame_internal(window& window)
{
const int selected_row =
find_widget<listbox>(&window, "savegame_list", false).get_selected_row();
@ -247,6 +253,36 @@ void game_load::display_savegame(window& window)
change_difficulty_toggle.set_active(!is_replay && is_scenario_start);
}
// This is a wrapper that prevents a corrupted save file (if it happens to be
// the first in the list) from making the dialog fail to open.
void game_load::display_savegame(window& window)
{
try {
game_load::display_savegame_internal(window);
} catch(const config::error& e) {
// Clear the UI widgets, show an error message.
const std::string preamble = _("The selected file is corrupt: ");
const std::string message = e.message.empty() ? "(no details)" : e.message;
ERR_GAMELOADDLG << preamble << message << "\n";
find_widget<minimap>(&window, "minimap", false).set_map_data("");
find_widget<label>(&window, "lblScenario", false)
.set_label(preamble);
find_widget<scroll_label>(&window, "slblSummary", false)
.set_label(message);
listbox& leader_list = find_widget<listbox>(&window, "leader_list", false);
leader_list.clear();
toggle_button& replay_toggle = dynamic_cast<toggle_button&>(*show_replay_->get_widget());
toggle_button& cancel_orders_toggle = dynamic_cast<toggle_button&>(*cancel_orders_->get_widget());
toggle_button& change_difficulty_toggle = dynamic_cast<toggle_button&>(*change_difficulty_->get_widget());
replay_toggle.set_active(false);
cancel_orders_toggle.set_active(false);
change_difficulty_toggle.set_active(false);
}
}
void game_load::filter_text_changed(text_box_base* textbox, const std::string& text)
{
window& window = *textbox->get_window();

1
src/gui/dialogs/game_load.hpp
View file

@ -54,6 +54,7 @@ private:
void filter_text_changed(text_box_base* textbox, const std::string& text);
void delete_button_callback(window& window);
void display_savegame_internal(window& window);
void display_savegame(window& window);
void evaluate_summary_string(std::stringstream& str, const config& cfg_summary);