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

Fix crash when adding/removing hotkeys with no matches

Browse source
This commit is contained in:
Reuben Rakete 2019-05-13 20:17:45 +12:00 • committed by jostephd
parent e27ddf7535
commit aa901478c2
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/dialogs/preferences_dialog.cpp
View file

@ -846,6 +846,11 @@ listbox& preferences_dialog::setup_hotkey_list(window& window)
void preferences_dialog::add_hotkey_callback(listbox& hotkeys)
{
int row_number = hotkeys.get_selected_row();
if(row_number < 0) {
gui2::show_transient_message("", _("No hotkey selected"));
return;
}
const hotkey::hotkey_command& hotkey_item = *visible_hotkeys_[row_number];
gui2::dialogs::hotkey_bind bind_dlg(hotkey_item.command);
@ -911,6 +916,11 @@ void preferences_dialog::default_hotkey_callback(window& window)
void preferences_dialog::remove_hotkey_callback(listbox& hotkeys)
{
int row_number = hotkeys.get_selected_row();
if(row_number < 0) {
gui2::show_transient_message("", _("No hotkey selected"));
return;
}
const hotkey::hotkey_command& hotkey_item = *visible_hotkeys_[row_number];
hotkey::clear_hotkeys(hotkey_item.command);
find_widget<label>(hotkeys.get_row_grid(row_number), "lbl_hotkey", false).set_label(hotkey::get_names(hotkey_item.command));