diff options
| author | Filippos Karapetis | 2015-01-16 01:44:15 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2015-01-16 01:47:31 +0200 |
| commit | 4287e2ebcaf2d78d5dd0d112ec8db4a8c916f6d1 (patch) | |
| tree | 3fc3ea86fe2d98016f457aee593c216091abc75b /engines/zvision | |
| parent | 89f233f4881589b925e871becbf3ec1b08db108e (diff) | |
| download | scummvm-rg350-4287e2ebcaf2d78d5dd0d112ec8db4a8c916f6d1.tar.gz scummvm-rg350-4287e2ebcaf2d78d5dd0d112ec8db4a8c916f6d1.tar.bz2 scummvm-rg350-4287e2ebcaf2d78d5dd0d112ec8db4a8c916f6d1.zip | |
ZVISION: Allow empty sound streams. Fixes bugs #6762 and #6763
A regression from commit 07ad10babe
Diffstat (limited to 'engines/zvision')
| -rw-r--r-- | engines/zvision/sound/zork_raw.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp index 0ef5de2f55..7bdd4875fc 100644 --- a/engines/zvision/sound/zork_raw.cpp +++ b/engines/zvision/sound/zork_raw.cpp @@ -256,9 +256,9 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath, actualName.setChar('c', actualName.size() - 1); if (!engine->getSearchManager()->openFile(*file, actualName)) - error("File not found: %s", actualName.c_str()); + return NULL; } else if (!found && !isRaw) { - error("File not found: %s", actualName.c_str()); + return NULL; } // Get the file name |