From 40706a8837eec30bc24559d3c3de5a104961dcd7 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Tue, 6 Feb 2018 12:45:40 +1100 Subject: [PATCH] Added confirmation when clearing map labels (fixes #2371) --- changelog | 1 + src/menu_events.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/changelog b/changelog index 6461b00af524..3fe806380edd 100644 --- a/changelog +++ b/changelog @@ -61,6 +61,7 @@ Version 1.13.11: * Greatly improved behavior of sliders. * Fixed crash when modifying an existing friend entry in Preferences. * Fixed players being unable to start campaigns in MP mode. + * Added confirmation prompt when clearing map labels. * WFL Engine: * A new string insert() function has been added, similar to replace() * WML Engine: diff --git a/src/menu_events.cpp b/src/menu_events.cpp index 6ed0d5607088..f77bfbcc38d1 100644 --- a/src/menu_events.cpp +++ b/src/menu_events.cpp @@ -799,8 +799,16 @@ void menu_handler::label_terrain(mouse_handler& mousehandler, bool team_only) void menu_handler::clear_labels() { if(gui_->team_valid() && !board().is_observer()) { - gui_->labels().clear(gui_->current_team_name(), false); - resources::recorder->clear_labels(gui_->current_team_name(), false); + const int res = gui2::show_message( + _("Clear Labels"), + _("Are you sure you want to clear map labels?"), + gui2::dialogs::message::yes_no_buttons + ); + + if(res == gui2::window::OK) { + gui_->labels().clear(gui_->current_team_name(), false); + resources::recorder->clear_labels(gui_->current_team_name(), false); + } } }