Browse Source

Moved volume change in modplug decoder to after check if file has been loaded, thanks Michael R (fixes #60)

Bart van Strien 15 years ago
parent
commit
fe60afda0e
2 changed files with 4 additions and 3 deletions
  1. 1 0
      changes.txt
  2. 3 3
      src/modules/sound/lullaby/ModPlugDecoder.cpp

+ 1 - 0
changes.txt

@@ -33,6 +33,7 @@ LOVE 0.7.0
   * Fixed invalid FSAA values crashing LÖVE.
   * Fixed a bunch of compiler warnings.
   * Fixed OS X not properly using UTIs for .love files.
+  * Fixed the modplug decoder not properly handeling files that fail to load.
 
   * Changed fonts, they're now po2 safe.
   * Changed the traceback in the error screen.

+ 3 - 3
src/modules/sound/lullaby/ModPlugDecoder.cpp

@@ -43,11 +43,11 @@ namespace lullaby
 
 		// Load the module.
 		plug = ModPlug_Load(data->getData(), data->getSize());
-
-		ModPlug_SetMasterVolume(plug, 512);
-
+		
 		if(plug == 0)
 			throw love::Exception("Could not load file with ModPlug.");
+
+		ModPlug_SetMasterVolume(plug, 512);
 	}
 
 	ModPlugDecoder::~ModPlugDecoder()