[Scummvm-cvs-logs] scummvm master -> 6546882b4f6de983a43d140eb4faf8171a12a1c1
bluegr
bluegr at gmail.com
Fri Jul 10 12:08:36 CEST 2015
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
6546882b4f SAGA: Avoid crash if the engine errors out before full initialization
Commit: 6546882b4f6de983a43d140eb4faf8171a12a1c1
https://github.com/scummvm/scummvm/commit/6546882b4f6de983a43d140eb4faf8171a12a1c1
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-07-10T13:07:09+03:00
Commit Message:
SAGA: Avoid crash if the engine errors out before full initialization
This may happen for example if the Miles Adlib driver errors out
because of missing instrument data files (*.AD)
Changed paths:
engines/saga/saga.cpp
diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp
index 763e3a0..b94bb66 100644
--- a/engines/saga/saga.cpp
+++ b/engines/saga/saga.cpp
@@ -637,6 +637,9 @@ void SagaEngine::syncSoundSettings() {
}
void SagaEngine::pauseEngineIntern(bool pause) {
+ if (!_render || !_music)
+ return;
+
bool engineIsPaused = (_render->getFlags() & RF_RENDERPAUSE);
if (engineIsPaused == pause)
return;
More information about the Scummvm-git-logs
mailing list