X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=6c0c0954597864da8832857b9c4786f77b3ef237;hb=79095ed1df46f16fd9d4767ea7f548531b009ff2;hp=a990c69b24b0fb473f2551cca1d0be245f9b8cd1;hpb=b0278ee8b412817233ae20b9edb6f7a641774c67;p=supertux.git

diff --git a/src/title.cpp b/src/title.cpp
index a990c69b2..6c0c09545 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -32,6 +32,7 @@
 #include <SDL.h>
 #include <SDL_image.h>
 #include <physfs.h>
+#include <algorithm>
 
 #include "title.hpp"
 #include "mainloop.hpp"
@@ -303,7 +304,7 @@ TitleScreen::check_addons_menu()
       addons_menu->set_active_item(index);
     } 
     catch (std::runtime_error e) {
-      log_warning << "Check for available Add-ons failed with error message \"" << e.what() << "\"" << std::endl;
+      log_warning << "Check for available Add-ons failed: " << e.what() << std::endl;
     }
     return;
   }
@@ -314,22 +315,24 @@ TitleScreen::check_addons_menu()
     if (!addon.isInstalled) {
       try {
         addon.install();
-        generate_addons_menu();
-        Menu::set_current(addons_menu.get());
-        addons_menu->set_active_item(index);
+        //generate_addons_menu();
+        //Menu::set_current(addons_menu.get());
+        //addons_menu->set_active_item(index);
+        Menu::set_current(0);
       } 
       catch (std::runtime_error e) {
-        log_warning << "Installation of Add-on failed with error message \"" << e.what() << "\"" << std::endl;
+        log_warning << "Installation of Add-on failed: " << e.what() << std::endl;
       }
     } else {
       try {
         addon.remove();
-        generate_addons_menu();
-        Menu::set_current(addons_menu.get());
-        addons_menu->set_active_item(index);
+        //generate_addons_menu();
+        //Menu::set_current(addons_menu.get());
+        //addons_menu->set_active_item(index);
+        Menu::set_current(0);
       } 
       catch (std::runtime_error e) {
-        log_warning << "Removal of Add-on failed with error message \"" << e.what() << "\"" << std::endl;
+        log_warning << "Removal of Add-on failed: " << e.what() << std::endl;
       }
     }
   }
@@ -378,6 +381,12 @@ TitleScreen::TitleScreen()
   player->set_controller(controller.get());
   player->set_speedlimit(230); //MAX_WALK_XM
 
+  generate_main_menu();
+}
+
+void
+TitleScreen::generate_main_menu()
+{
   main_menu.reset(new Menu());
   main_menu->set_pos(SCREEN_WIDTH/2, SCREEN_HEIGHT/2 + 35);
   main_menu->add_entry(MNID_STARTGAME, _("Start Game"));
@@ -473,6 +482,7 @@ TitleScreen::update(float elapsed_time)
           break;
         case MNID_QUITMAINMENU:
           main_loop->quit(new FadeOut(0.25));
+		  sound_manager->stop_music(0.25);
           break;
       }
     } else if(menu == load_game_menu.get()) {
@@ -505,6 +515,7 @@ TitleScreen::update(float elapsed_time)
   // reopen menu of user closed it (so that the app doesn't close when user
   // accidently hit ESC)
   if(Menu::current() == 0) {
+    generate_main_menu();
     Menu::set_current(main_menu.get());
   }
 }