[Scummvm-git-logs] scummvm master -> 915c6bff2ef21fe791be8df6e0b1932213335f75

sev- sev at scummvm.org
Sat Nov 12 12:13:50 CET 2016


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cbd5946ad8 WINTERMUTE: Log warning if addSound is called with empty filename
915c6bff2e Merge pull request #732 from tobiatesan/fix_6594


Commit: cbd5946ad8a1a72b05a1be928827d2e4e7bd5298
    https://github.com/scummvm/scummvm/commit/cbd5946ad8a1a72b05a1be928827d2e4e7bd5298
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2016-04-01T15:25:27+02:00

Commit Message:
WINTERMUTE: Log warning if addSound is called with empty filename

Changed paths:
    engines/wintermute/base/sound/base_sound_manager.cpp



diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp
index f1e0c3b..3b91f14 100644
--- a/engines/wintermute/base/sound/base_sound_manager.cpp
+++ b/engines/wintermute/base/sound/base_sound_manager.cpp
@@ -97,6 +97,11 @@ BaseSoundBuffer *BaseSoundMgr::addSound(const Common::String &filename, Audio::M
 		return nullptr;
 	}
 
+	if (filename.empty()) {
+		// At least one game, Bickadoodle, calls playSound with an empty filename, see #6594
+		BaseEngine::LOG(0, "addSound called with empty filename");
+	}
+
 	BaseSoundBuffer *sound;
 
 	Common::String useFilename = filename;


Commit: 915c6bff2ef21fe791be8df6e0b1932213335f75
    https://github.com/scummvm/scummvm/commit/915c6bff2ef21fe791be8df6e0b1932213335f75
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-12T12:13:47+01:00

Commit Message:
Merge pull request #732 from tobiatesan/fix_6594

WINTERMUTE: Log warning if addSound is called with empty filename

Changed paths:
    engines/wintermute/base/sound/base_sound_manager.cpp








More information about the Scummvm-git-logs mailing list