Fix #954: Startup failure when simple_away is loaded after awaynick

diff --git a/src/User.cpp b/src/User.cpp
index 970039df8c7ac57bf3d71416db3df93e6858c3bf..8f295eb4c6aa2be7c1ffabc622e9f902506ab627 100644 (file)
--- a/src/User.cpp
+++ b/src/User.cpp
@@ -1101,6 +1101,11 @@ bool CUser::LoadModule(const CString& sModName, const CString& sArgs, const CStr
                CFile fNVFile = CFile(GetUserPath() + "/moddata/" + sModName + "/.registry");
 
                for (vector<CIRCNetwork*>::iterator it = m_vIRCNetworks.begin(); it != m_vIRCNetworks.end(); ++it) {
+                       // Check whether the network already has this module loaded (#954)
+                       if ((*it)->GetModules().FindModule(sModName)) {
+                               continue;
+                       }
+
                        if (fNVFile.Exists()) {
                                CString sNetworkModPath = (*it)->GetNetworkPath() + "/moddata/" + sModName;
                                if (!CFile::Exists(sNetworkModPath)) {