From 5dad41851e9559675a2530539efa56d25f3566f4 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 22 Nov 2017 19:41:49 -0500
Subject: TSAGE: R2R: Fix brief flash of UI when starting demo

---
 engines/tsage/ringworld2/ringworld2_logic.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'engines/tsage')

diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index e8d51109b1..f54efb5a8a 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -387,9 +387,13 @@ void SceneExt::postInit(SceneObjectList *OwnerList) {
 	int prevScene = R2_GLOBALS._sceneManager._previousScene;
 	int sceneNumber = R2_GLOBALS._sceneManager._sceneNumber;
 	if (g_vm->getFeatures() & GF_DEMO) {
-		if (((prevScene == -1) && (sceneNumber != 180) && (sceneNumber != 205) && (sceneNumber != 50))
+		if (prevScene == 0 && sceneNumber == 180) {
+			// Very start of the demo, title & intro about to be shown
+			R2_GLOBALS._uiElements._active = false;
+			R2_GLOBALS._uiElements.hide();
+		} else if (((prevScene == -1) && (sceneNumber != 180) && (sceneNumber != 205) && (sceneNumber != 50))
 			|| (prevScene == 0) || (sceneNumber == 600)
-			|| ((prevScene == 205 || prevScene == 180) && (sceneNumber == 100))) {
+			|| ((prevScene == 205 || prevScene == 180 || prevScene == 50) && (sceneNumber == 100))) {
 				R2_GLOBALS._uiElements._active = true;
 				R2_GLOBALS._uiElements.show();
 		} else {
-- 
cgit v1.2.3