Fix race condition on exit to menu
authorsapier <Sapier at GMX dot net>
Sun, 9 Mar 2014 10:01:13 +0000 (11:01 +0100)
committersapier <Sapier at GMX dot net>
Sun, 9 Mar 2014 10:01:13 +0000 (11:01 +0100)
src/game.cpp

index 64e2ffcc76d854b428355650504a55a67e985c84..2e98d09e9fc7aec69a76667807773af7873d2ba8 100644 (file)
@@ -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() + ";]"
                ;