Don't match on {nick}

diff --git a/palaver.cpp b/palaver.cpp
index 3f85379bce322ad783b3cb8ecd84d248ee61d435..1dcc2057cb036134378f50f5bc81eac6082c86fd 100644 (file)
--- a/palaver.cpp
+++ b/palaver.cpp
@@ -256,12 +256,12 @@ public:
                                it != m_vMentionKeywords.end(); ++it) {
                        const CString& sKeyword = *it;
 
-                       if (sKeyword.Equals("{nick}") && sMessage.find(sNick) != std::string::npos) {
-                               bResult = true;
-                               break;
-                       }
-
-                       if (sMessage.find(sKeyword) != std::string::npos) {
+                       if (sKeyword.Equals("{nick}")) {
+                               if (sMessage.find(sNick) != std::string::npos) {
+                                       bResult = true;
+                                       break;
+                               }
+                       } else if (sMessage.find(sKeyword) != std::string::npos) {
                                bResult = true;
                                break;
                        }