From 0474c2eb1f7e05942ff0b1abf45290e672cfb93d Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Fri, 24 Feb 2017 10:47:31 +1100 Subject: [PATCH] Simple Item Selector: save selected index even on cancel This is a better fix for bug #25536 since it allows easy bypassing of the dialog with Esc if single button mode was enabled, but without crashing. Usecases can stil explicitly check for the dialog retval for conditional behavior. --- src/gui/dialogs/simple_item_selector.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gui/dialogs/simple_item_selector.cpp b/src/gui/dialogs/simple_item_selector.cpp index d171f4e07f7c..51b5a154c6a2 100644 --- a/src/gui/dialogs/simple_item_selector.cpp +++ b/src/gui/dialogs/simple_item_selector.cpp @@ -120,12 +120,8 @@ void simple_item_selector::pre_show(window& window) void simple_item_selector::post_show(window& window) { - if(get_retval() != window::OK) { - return; - } - - listbox& list = find_widget(&window, "listbox", false); - index_ = list.get_selected_row(); + index_ = find_widget(&window, "listbox", false).get_selected_row(); } + } // namespace dialogs } // namespace gui2