From b1da6a74c5dc22b42606649059bb35722010cc31 Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Thu, 7 Jun 2018 20:14:27 +0200
Subject: DIRECTOR: Show a GUI error message when no sound devices are
 available

---
 engines/director/director.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines/director/director.cpp')

diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index ec35022b4a..f2ad5db3cc 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -50,9 +50,6 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
 
 	g_director = this;
 
-	if (!_mixer->isReady())
-		error("Sound initialization failed");
-
 	// Setup mixer
 	syncSoundSettings();
 
@@ -116,6 +113,10 @@ DirectorEngine::~DirectorEngine() {
 Common::Error DirectorEngine::run() {
 	debug("Starting v%d Director game", getVersion());
 
+	if (!_mixer->isReady()) {
+		return Common::kAudioDeviceInitFailed;
+	}
+
 	_currentPalette = nullptr;
 
 	_macBinary = nullptr;
-- 
cgit v1.2.3