Changeset 7289 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Apr 13, 2006, 11:27:09 PM (19 years ago)

Author:

bensch

Message:

some more stuff, but still not working as it should

File:

• trunk/src/story_entities/game_world.cc (modified) (3 diffs)

trunk/src/story_entities/game_world.cc

@@ -103 +103 @@
   PRINTF(4)("Deleted GameWorld\n");
 
-  if (this->audioThread != NULL)
-    SDL_KillThread(this->audioThread);
 }
 
@@ -206 +204 @@
   PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
 
+  if (this->audioThread != NULL)
+  {
+    this->bRunning = false;
+    SDL_WaitThread(this->audioThread, NULL);
+    this->audioThread = NULL;
+  }
+
   this->dataTank->unloadData();
 
@@ -237 +242 @@
   this->bRunning = false;
 
-  //  SDL_KillThread(this->audioThread);
   this->audioThread = NULL;
 }