From d2c462ae03f5a2b4b79fd342930875fde7b196cd Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 29 Aug 2015 21:07:55 +0200 Subject: [PATCH] Fix yet another startup failure with awaynick & simple_away The detection whether simple_away is already on the list of loaded modules failed when the simple_away load line contained arguments. Close #954 --- src/IRCNetwork.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/IRCNetwork.cpp b/src/IRCNetwork.cpp index d97e10b5..a022b0e9 100644 --- a/src/IRCNetwork.cpp +++ b/src/IRCNetwork.cpp @@ -422,7 +422,13 @@ bool CIRCNetwork::ParseConfig(CConfig *pConfig, CString& sError, bool bUpgrade) // XXX The awaynick module was retired in 1.6 (still available as external module) if (sModName == "awaynick") { // load simple_away instead, unless it's already on the list - if (std::find(vsList.begin(), vsList.end(), "simple_away") == vsList.end()) { + bool bFound = false; + for (const CString& sLoadMod : vsList) { + if (sLoadMod.Token(0).Equals("simple_away")) { + bFound = true; + } + } + if (!bFound) { sNotice = "Loading network module [simple_away] instead"; sModName = "simple_away"; // not a fatal error if simple_away is not available