From 372e655d7004e39f0989274c493a6e177af032e1 Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 26 Mar 2023 13:30:35 +0000 Subject: [PATCH] Merge branch 'fix-addfile-double-error' into 'master' Fix networked addfile command erroring twice for already added files See merge request KartKrew/Kart!1100 --- src/d_netcmd.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index d6f39047f..ac461a9e4 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -4419,6 +4419,7 @@ static void Command_Addfile(void) memset(md5sum,0,16); #else FILE *fhandle; + boolean valid = true; if ((fhandle = W_OpenWadFile(&fn, true)) != NULL) { @@ -4436,9 +4437,15 @@ static void Command_Addfile(void) if (!memcmp(wadfiles[i]->md5sum, md5sum, 16)) { CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), fn); - continue; + valid = false; + break; } } + + if (valid == false) + { + continue; + } #endif WRITEMEM(buf_p, md5sum, 16); }