Browse Source

if mgr invalid, return nullsound

cxgeorge 23 years ago
parent
commit
87fd0601c9
1 changed files with 7 additions and 0 deletions
  1. 7 0
      panda/src/audiotraits/milesAudioManager.cxx

+ 7 - 0
panda/src/audiotraits/milesAudioManager.cxx

@@ -26,6 +26,7 @@
 #include "config_util.h"
 #include "config_util.h"
 #include "config_express.h"
 #include "config_express.h"
 #include "virtualFileSystem.h"
 #include "virtualFileSystem.h"
+#include "nullAudioSound.h"
 #include <algorithm>
 #include <algorithm>
 
 
 int MilesAudioManager::_active_managers = 0;
 int MilesAudioManager::_active_managers = 0;
@@ -256,6 +257,12 @@ load(Filename file_name) {
 PT(AudioSound) MilesAudioManager::
 PT(AudioSound) MilesAudioManager::
 get_sound(const string& file_name) {
 get_sound(const string& file_name) {
   audio_debug("MilesAudioManager::get_sound(file_name=\""<<file_name<<"\")");
   audio_debug("MilesAudioManager::get_sound(file_name=\""<<file_name<<"\")");
+
+  if(!is_valid()) {
+     audio_debug("invalid MilesAudioManager returning NullSound");
+     return new NullAudioSound();
+  }
+
   assert(is_valid());
   assert(is_valid());
   Filename path = file_name;
   Filename path = file_name;