From 509738bb494247f2232b5b91719dba43b31fd661 Mon Sep 17 00:00:00 2001 From: Thanasis Antoniou Date: Sun, 14 Jul 2019 02:18:34 +0300 Subject: BLADERUNNER: Fix seg fault at load from ScummVM menu Happened if player was clicking mouse furiously while loading from the ScummVM GUI --- engines/bladerunner/bladerunner.cpp | 1 - engines/bladerunner/script/scene_script.cpp | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp index ecb4048233..8c729a7b36 100644 --- a/engines/bladerunner/bladerunner.cpp +++ b/engines/bladerunner/bladerunner.cpp @@ -374,7 +374,6 @@ Common::Error BladeRunnerEngine::run() { // else { // newGame(kGameDifficultyMedium); // } - gameLoop(); _mouse->disable(); diff --git a/engines/bladerunner/script/scene_script.cpp b/engines/bladerunner/script/scene_script.cpp index 8cfe8b3055..14b353dcf4 100644 --- a/engines/bladerunner/script/scene_script.cpp +++ b/engines/bladerunner/script/scene_script.cpp @@ -182,7 +182,10 @@ bool SceneScript::mouseClick(int x, int y) { _inScriptCounter++; _mouseX = x; _mouseY = y; - bool result = _currentScript->MouseClick(x, y); + bool result = false; + if (_currentScript != nullptr) { + result = _currentScript->MouseClick(x, y); + } _vm->_runningActorId = -1; _inScriptCounter--; _mouseX = -1; -- cgit v1.2.3