X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Foptions_menu.cpp;h=ccadc447e28f8f158e0cf2415d51747d5aed359e;hb=43db9a6c44b6ee544e7694d1bb234ba559b0849c;hp=644028cebe079aeacecd55a4927bf0043988a790;hpb=6dfb72a982a52129cb2b55cd41222914a819ecb4;p=supertux.git diff --git a/src/options_menu.cpp b/src/options_menu.cpp index 644028ceb..ccadc447e 100644 --- a/src/options_menu.cpp +++ b/src/options_menu.cpp @@ -71,13 +71,13 @@ public: config->locale = ""; dictionary_manager.set_language(config->locale); config->save(); - Menu::set_current(0); + Menu::pop_current(); } else if (item->id == 1) { config->locale = "en"; dictionary_manager.set_language(config->locale); config->save(); - Menu::set_current(0); + Menu::pop_current(); } int mnid = 10; std::set languages = dictionary_manager.get_languages(); @@ -87,7 +87,7 @@ public: config->locale = locale_name; dictionary_manager.set_language(config->locale); config->save(); - Menu::set_current(0); + Menu::pop_current(); } } } @@ -214,8 +214,8 @@ OptionsMenu::OptionsMenu() add_toggle(MNID_MUSIC, _("Music"), config->music_enabled) ->set_help(_("Disable all music")); } else { - add_deactive(MNID_SOUND, _("Sound (disabled)")); - add_deactive(MNID_MUSIC, _("Music (disabled)")); + add_inactive(MNID_SOUND, _("Sound (disabled)")); + add_inactive(MNID_MUSIC, _("Music (disabled)")); } add_submenu(_("Setup Keyboard"), main_controller->get_key_options_menu())