From a9dd9f03743cb0b1f8694fabffe7a490b337c11e Mon Sep 17 00:00:00 2001 From: that Date: Thu, 23 Feb 2017 23:08:56 +0100 Subject: gui: preserve order of gui_print vs gui_msg - rename __gui_print to internal_gui_print (__* is reserved for compiler) - translate outstanding messages in internal_gui_print - add locking because background thread could print while we render - minor cleanup Change-Id: Ib687d2cfb4763ad08ad4d4b76daf5b129d61d2e2 --- gui/pages.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'gui/pages.cpp') diff --git a/gui/pages.cpp b/gui/pages.cpp index b2a978f4d..bf6c6921c 100644 --- a/gui/pages.cpp +++ b/gui/pages.cpp @@ -58,11 +58,6 @@ extern "C" { extern int gGuiRunning; -// From console.cpp -extern size_t last_message_count; -extern std::vector gConsole; -extern std::vector gConsoleColor; - std::map PageManager::mPageSets; PageSet* PageManager::mCurrentSet; MouseCursor *PageManager::mMouseCursor = NULL; @@ -1541,9 +1536,7 @@ int PageManager::RunReload() { } // This makes the console re-translate - last_message_count = 0; - gConsole.clear(); - gConsoleColor.clear(); + GUIConsole::Clear_For_Retranslation(); return ret_val; } -- cgit v1.2.3