adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-06-28 22:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.6.x'

Browse Source 
Conflicts:
	src/User.cpp
This commit is contained in:
Alexey Sokolov
2015-04-28 21:44:07 +01:00
parent 63a938478a d335c3cdf6
commit 8f9aad4580
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/User.cpp
+5
View File
@@ -1095,6 +1095,11 @@ bool CUser::LoadModule(const CString& sModName, const CString& sArgs, const CStr
CFile fNVFile = CFile(GetUserPath() + "/moddata/" + sModName + "/.registry");
for (CIRCNetwork* pNetwork : m_vIRCNetworks) {
// Check whether the network already has this module loaded (#954)
if (pNetwork->GetModules().FindModule(sModName)) {
continue;
}
if (fNVFile.Exists()) {
CString sNetworkModPath = pNetwork->GetNetworkPath() + "/moddata/" + sModName;
if (!CFile::Exists(sNetworkModPath)) {