aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2014-03-09 11:01:13 +0100
committersapier <Sapier at GMX dot net>2014-03-09 11:01:13 +0100
commit16a028dd6bae0c7c2e797489e12d17d719842f99 (patch)
tree69c52694fd074f08f8f4523c84203d6d10a3e6c0
parent28d6326bd42a88d5a9245c70d7044d19e4d07954 (diff)
downloadminetest-16a028dd6bae0c7c2e797489e12d17d719842f99.tar.gz
minetest-16a028dd6bae0c7c2e797489e12d17d719842f99.tar.bz2
minetest-16a028dd6bae0c7c2e797489e12d17d719842f99.zip
Fix race condition on exit to menu
-rw-r--r--src/game.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 64e2ffcc7..2e98d09e9 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() + ";]"
;