1
0
mirror of https://github.com/moparisthebest/minetest synced 2024-11-16 22:35:07 -05:00

Fix race condition on exit to menu

This commit is contained in:
sapier 2014-03-09 11:01:13 +01:00
parent 28d6326bd4
commit 16a028dd6b

View File

@ -1019,9 +1019,9 @@ static void show_pause_menu(FormspecFormSource* current_formspec,
std::string formspec = std::string formspec =
"size[11,5.5,true]" "size[11,5.5,true]"
"button_exit[4,1;3,0.5;btn_continue;" + std::string(gettext("Continue")) + "]" "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_exit[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_exit[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,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[7.5,0.25;3.75,6;;" + std::string(control_text) + ";]"
"textarea[0.4,0.25;3.5,6;;" + os.str() + ";]" "textarea[0.4,0.25;3.5,6;;" + os.str() + ";]"
; ;