From ba5f95533903ed6190b0fddede258c86540afffa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Klou=C4=8Dek?= Date: Tue, 2 Jun 2009 15:05:45 +0000 Subject: [PATCH] Fix for bug #436 - just clear last_menus when set_current(NULL) is called SVN-Revision: 5891 --- src/gui/menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp index abed287d7..cc062a08a 100644 --- a/src/gui/menu.cpp +++ b/src/gui/menu.cpp @@ -144,7 +144,6 @@ Menu::pop_current() void Menu::set_current(Menu* menu) { - //last_menus.clear(); if (current_ && current_->close == true) return; @@ -156,6 +155,7 @@ Menu::set_current(Menu* menu) current_ = menu; } else if (current_) { + last_menus.clear(); //NULL new menu pointer => close all menus current_->effect_start_time = real_time; current_->effect_progress = 0.0f; current_->close = true; -- 2.11.0