Unstable v0.19.5.0

2022-09-14 12:47:17 -03:00
parent 3f2c843247
commit 1fd2a51bbb
158 changed files with 5702 additions and 4813 deletions
@@ -353,7 +353,7 @@ namespace Barotrauma
                    // Check for duplicate binds when introducing new binds
                    foreach (var defaultBinding in defaultBindings)
                    {
-                        if (!savedBindings.ContainsKey(defaultBinding.Key))
+                        if (!IsSetToNone(defaultBinding.Value) && !savedBindings.ContainsKey(defaultBinding.Key))
                        {
                            foreach (var savedBinding in savedBindings)
                            {
@@ -373,6 +373,8 @@ namespace Barotrauma
                                }
                            }
                        }
+
+                        static bool IsSetToNone(KeyOrMouse keyOrMouse) => keyOrMouse == Keys.None && keyOrMouse == MouseButton.None;
                    }

                    // Clear the old chat binds for configs saved before the introduction of the new chat binds