Bugfix: it was impossible to create a level subset in leveleditor cause Create button...

[supertux.git] / src / leveleditor.cpp

diff --git a/src/leveleditor.cpp b/src/leveleditor.cpp
index de5a83b..b861345 100644 (file)
--- a/src/leveleditor.cpp
+++ b/src/leveleditor.cpp
@@ -268,9 +268,13 @@ while(SDL_PollEvent(&event))
       }
     else if(menu == create_subset_menu)
       {
+      // activate or deactivate Create button if any filename as been specified
       if(create_subset_menu->get_item_by_id(MN_ID_FILENAME_SUBSET).input[0] == '\0')
         create_subset_menu->get_item_by_id(MN_ID_CREATE_SUBSET).kind = MN_DEACTIVE;
-      else if(create_subset_menu->check() == MN_ID_CREATE_SUBSET)
+      else
+        create_subset_menu->get_item_by_id(MN_ID_CREATE_SUBSET).kind = MN_ACTION;
+
+      if(create_subset_menu->check() == MN_ID_CREATE_SUBSET)
         {   // applying settings:
         LevelSubset::create(create_subset_menu->get_item_by_id(MN_ID_FILENAME_SUBSET).input);
 
@@ -840,7 +844,8 @@ if(level_changed)
 GameSession session(level_filename, ST_GL_TEST);
 session.run();
 //  player_status.reset();
-sound_manager->halt_music();
+if(sound_manager)
+  sound_manager->halt_music();
 }
 
 void LevelEditor::change(int x, int y, int newtile, int layer)