From 994550fb006c11f68d7fd62de462010000b2456e Mon Sep 17 00:00:00 2001
From: SanyaWaffles <sanya.waffles@gmail.com>
Date: Fri, 24 Apr 2020 03:56:57 -0400
Subject: [PATCH] Add the check to the other loop per Graf's request.

---
 src/common/console/c_bind.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/common/console/c_bind.cpp b/src/common/console/c_bind.cpp
index d804474751..7dcabf96cc 100644
--- a/src/common/console/c_bind.cpp
+++ b/src/common/console/c_bind.cpp
@@ -717,7 +717,13 @@ void C_SetDefaultKeys(const char* baseconfig)
 	while ((lump = fileSystem.FindLumpFullName(baseconfig, &lastlump)) != -1)
 	{
 		if (fileSystem.GetFileContainer(lump) > 0) break;
-		ReadBindings(lump, true);
+		// [SW] - We need to check to see the origin of the DEFBINDS... if it
+		// Comes from an IWAD/IPK3/IPK7 allow it to override the users settings...
+		// If it comes from a user mod however, don't.
+		if (fileSystem.GetFileContainer(lump) > fileSystem.GetMaxIwadNum())
+			ReadBindings(lump, false);
+		else
+			ReadBindings(lump, true);
 	}
 
 	lastlump = 0;