[Scummvm-git-logs] scummvm master -> 1f63fd3b90ce8405f99417cc6a9c1cb64074098b

digitall 547637+digitall at users.noreply.github.com
Tue Jul 13 18:05:15 UTC 2021


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:
1f63fd3b90 GLK: TADS2: Fix GCC Warning


Commit: 1f63fd3b90ce8405f99417cc6a9c1cb64074098b
    https://github.com/scummvm/scummvm/commit/1f63fd3b90ce8405f99417cc6a9c1cb64074098b
Author: D G Turner (digitall at scummvm.org)
Date: 2021-07-13T19:04:48+01:00

Commit Message:
GLK: TADS2: Fix GCC Warning

Changed paths:
    engines/glk/tads/tads2/run.cpp


diff --git a/engines/glk/tads/tads2/run.cpp b/engines/glk/tads/tads2/run.cpp
index 5ff02b283f..f63c240cdd 100644
--- a/engines/glk/tads/tads2/run.cpp
+++ b/engines/glk/tads/tads2/run.cpp
@@ -1571,8 +1571,11 @@ resume_from_error:
 					(prpnum)0, binum, nargc);
 				(*ctx->runcxbi[binum])((struct bifcxdef *)ctx->runcxbcx,
 					nargc);
-				dbgleave(ctx->runcxdbg,
-					ctx->runcxsp != stkp ? DBGEXVAL : DBGEXRET);
+				if (ctx->runcxsp != stkp) {
+					dbgleave(ctx->runcxdbg, DBGEXVAL);
+				} else {
+					dbgleave(ctx->runcxdbg, DBGEXRET);
+				}
 
 				p = runcprst(ctx, ofs, target, targprop);
 				p += 2;




More information about the Scummvm-git-logs mailing list