From 16a028dd6bae0c7c2e797489e12d17d719842f99 Mon Sep 17 00:00:00 2001 From: sapier Date: Sun, 9 Mar 2014 11:01:13 +0100 Subject: [PATCH] Fix race condition on exit to menu --- src/game.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 64e2ffcc..2e98d09e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1018,10 +1018,10 @@ static void show_pause_menu(FormspecFormSource* current_formspec, std::string formspec = "size[11,5.5,true]" - "button_exit[4,1;3,0.5;btn_continue;" + std::string(gettext("Continue"))+ "]" - "button[4,2;3,0.5;btn_sound;" + std::string(gettext("Sound Volume")) + "]" - "button[4,3;3,0.5;btn_exit_menu;" + std::string(gettext("Exit to Menu")) + "]" - "button[4,4;3,0.5;btn_exit_os;" + std::string(gettext("Exit to OS")) + "]" + "button_exit[4,1;3,0.5;btn_continue;" + std::string(gettext("Continue")) + "]" + "button_exit[4,2;3,0.5;btn_sound;" + std::string(gettext("Sound Volume")) + "]" + "button_exit[4,3;3,0.5;btn_exit_menu;" + std::string(gettext("Exit to Menu")) + "]" + "button_exit[4,4;3,0.5;btn_exit_os;" + std::string(gettext("Exit to OS")) + "]" "textarea[7.5,0.25;3.75,6;;" + std::string(control_text) + ";]" "textarea[0.4,0.25;3.5,6;;" + os.str() + ";]" ; -- 2.30.2