From: bones_was_here <bones_was_here@xonotic.au>
Date: Sun, 25 Feb 2024 22:34:08 +0000 (+1000)
Subject: MVM: fix endless loop when a command causes an error
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=45fabf40b88182584eb606d2bdf7cda8deecd811;p=xonotic%2Fdarkplaces.git

MVM: fix endless loop when a command causes an error

7e1f7d12f57c064a6855d9850d28387ca6092c45 should have included this.

Signed-off-by: bones_was_here <bones_was_here@xonotic.au>
---

diff --git a/menu.c b/menu.c
index 891ebe1e..92e95ed1 100644
--- a/menu.c
+++ b/menu.c
@@ -5246,6 +5246,9 @@ void MVM_error_cmd(const char *format, ...)
 	// reset the active scene, too (to be on the safe side ;))
 	R_SelectScene( RST_CLIENT );
 
+	// prevent an endless loop if the error was triggered by a command
+	Cbuf_Clear(cmd_local->cbuf);
+
 	// Let video start at least
 	Host_AbortCurrentFrame();
 }