X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgame_session.cpp;h=e918a09750480a582ae028648096efe7e32f6b1c;hb=a2e2ff929dfce1a2d892e0f7b83db52debde4201;hp=ee036eb18efc29a8e7d8efefd202c260c068b157;hpb=3364223e2ff9e7c4ea784ea065d5c53e223e51c8;p=supertux.git

diff --git a/src/game_session.cpp b/src/game_session.cpp
index ee036eb18..e918a0975 100644
--- a/src/game_session.cpp
+++ b/src/game_session.cpp
@@ -135,7 +135,6 @@ GameSession::restart_level()
   level->stats.total_badguys = level->get_total_badguys();
   level->stats.total_secrets = level->get_total_count<SecretAreaTrigger>();
   level->stats.reset();
-  if(reset_sector != "")level->stats.declare_invalid();
 
   if(reset_sector != "") {
     currentsector = level->get_sector(reset_sector);
@@ -144,11 +143,13 @@ GameSession::restart_level()
       msg << "Couldn't find sector '" << reset_sector << "' for resetting tux.";
       throw std::runtime_error(msg.str());
     }
+    level->stats.declare_invalid();
     currentsector->activate(reset_pos);
   } else {
     currentsector = level->get_sector("main");
     if(!currentsector)
       throw std::runtime_error("Couldn't find main sector");
+    play_time = 0;
     currentsector->activate("main");
   }
 
@@ -527,7 +528,7 @@ GameSession::update(float elapsed_time)
   }
 
   // update sounds
-  sound_manager->set_listener_position(currentsector->player->get_pos());
+  if (currentsector && currentsector->camera) sound_manager->set_listener_position(currentsector->camera->get_center());
 
   /* Handle music: */
   if (end_sequence)