[Scummvm-git-logs] scummvm master -> 4c763f6981f9e8a8758227648747370d8679e02c

[sev-]

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:
4c763f6981 DIRECTOR: Do not show GUI error under buildbot


Commit: 4c763f6981f9e8a8758227648747370d8679e02c
    https://github.com/scummvm/scummvm/commit/4c763f6981f9e8a8758227648747370d8679e02c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-23T16:25:09+02:00

Commit Message:
DIRECTOR: Do not show GUI error under buildbot

Changed paths:
    engines/director/director.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index 5bd03eeb36..41ade86e79 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -128,9 +128,15 @@ Archive *DirectorEngine::getMainArchive() const { return _currentStage->getMainA
 Movie *DirectorEngine::getCurrentMovie() const { return _currentStage->getCurrentMovie(); }
 Common::String DirectorEngine::getCurrentPath() const { return _currentStage->getCurrentPath(); }
 
+static void buildbotErrorHandler(const char *msg) { }
+
 Common::Error DirectorEngine::run() {
 	debug("Starting v%d Director game", getVersion());
 
+	// We want to avoid GUI errors for buildbot, because they hang it
+	if (debugChannelSet(-1, kDebugFewFramesOnly))
+		Common::setErrorHandler(buildbotErrorHandler);
+
 	if (!_mixer->isReady()) {
 		return Common::kAudioDeviceInitFailed;
 	}