Fix icons of buttons under the minimap disappearing on closing a menu

changelog

@@ -70,6 +70,8 @@ Version 1.13.5+dev:
    * Added a tab to run the wmlxgettext tool to GUI.pyw
    * Fixed problem with Spectre's hitpoint bar positioning.
    * Show correct number of attacks in case of swarm weapon special (bug #24978)
+   * Fixed bug that icons of buttons under the minimap disappeared when the player opened
+     and closed a menu.
 
 Version 1.13.5:
  * Campaigns:

players_changelog

@@ -21,6 +21,8 @@ Version 1.13.5+dev:
  * Miscellaneous and bug fixes:
    * Fixed a stray ; character appearing pre-entered in the command console.
    * Show correct number of attacks in case of swarm weapon special (bug #24978)
+   * Fixed bug that icons of buttons under the minimap disappeared when the player opened
+     and closed a menu.
 
 Version 1.13.5:
  * Campaigns:

src/controller_base.hpp

@@ -70,6 +70,11 @@ public:
 	void set_scroll_down(bool on);
 	void set_scroll_left(bool on);
 	void set_scroll_right(bool on);
+
+	/**
+	* Get (optionally) a command executor to handle context menu events
+	*/
+	virtual hotkey::command_executor * get_hotkey_command_executor() { return nullptr; }
 protected:
 	virtual bool is_browsing() const
 	{ return false; }
@@ -92,11 +97,6 @@ protected:
 	 */
 	virtual plugins_context * get_plugins_context() { return nullptr; }
 
-	/**
-	 * Get (optionally) a command executor to handle context menu events
-	 */
-	virtual hotkey::command_executor * get_hotkey_command_executor() { return nullptr; }
-
 	/**
 	 * Derived classes should override this to return false when arrow keys
 	 * should not scroll the map, hotkeys not processed etc, for example

src/display.cpp

@@ -24,6 +24,7 @@
 #include "game_preferences.hpp"
 #include "gettext.hpp"
 #include "halo.hpp"
+#include "hotkey/command_executor.hpp"
 #include "language.hpp"
 #include "log.hpp"
 #include "marked-up_text.hpp"
@@ -2674,6 +2675,15 @@ void display::redraw_everything()
 		create_buttons();
 	}
 
+	hotkey::command_executor* command_executor =
+		resources::controller->get_hotkey_command_executor();
+	if (command_executor != nullptr)
+	{
+		// This function adds button overlays,
+		// it needs to be run after recreating the buttons.
+		command_executor->set_button_state();
+	}
+
 	panelsDrawn_ = false;
 	if (!gui::in_dialog()) {
 		labels().recalculate_labels();