[Scummvm-git-logs] scummvm branch-2-7 -> 1928ac08475d1a1a2255c2f4f74f9c4fc60b8a65

[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:
1928ac0847 GLK: ADRIFT: Disable non-safe assert


Commit: 1928ac08475d1a1a2255c2f4f74f9c4fc60b8a65
    https://github.com/scummvm/scummvm/commit/1928ac08475d1a1a2255c2f4f74f9c4fc60b8a65
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-03T23:13:50+01:00

Commit Message:
GLK: ADRIFT: Disable non-safe assert

This assert depends on static variable which could lead to a crash
in case we re-enter the engine for some reason. Triggered on Android

Changed paths:
    engines/glk/adrift/os_glk.cpp


diff --git a/engines/glk/adrift/os_glk.cpp b/engines/glk/adrift/os_glk.cpp
index 40814d2009e..0f17d64a87e 100644
--- a/engines/glk/adrift/os_glk.cpp
+++ b/engines/glk/adrift/os_glk.cpp
@@ -3085,7 +3085,7 @@ bool adrift_startup_code(Common::SeekableReadStream *gameFile) {
 	const char *locale;
 	sc_uint trace_flags;
 	sc_bool enable_debugger, stable_random;
-	assert(!gsc_startup_called);
+	//assert(!gsc_startup_called);
 	gsc_startup_called = TRUE;
 
 	assert(gameFile);