1 files changed, 5 insertions, 0 deletions
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 8e021aa6..8dc2f0c5 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -165,10 +165,15 @@ bool KeyboardConfig::hasConflicts()
                    (mKey[i].value == mKey[j].value)
                )
             {
+                mBindError = strprintf(_("Conflict \"%s\" and \"%s\" keys. "
+                                         "Resolve them, or gameplay may result"
+                                         " in strange behaviour."),
+                                       mKey[i].caption.c_str(), mKey[j].caption.c_str());
                 return true;
             }
         }
     }
+    mBindError = "";
     return false;
 }