From 28393c309b222c3ab2b2b22752d756eb04f88da7 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 28 Apr 2015 10:00:55 +0200 Subject: [PATCH 1/2] Fix #954: Startup failure when simple_away is loaded after awaynick --- src/User.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/User.cpp b/src/User.cpp index 970039df..8f295eb4 100644 --- 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::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)) { From d335c3cdf63f9a83c26fac2e70a072683725f3db Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Tue, 28 Apr 2015 21:28:24 +0100 Subject: [PATCH 2/2] configure.ac: specify required compiler versions Close #956 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1733d614..2c252581 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ AC_PROG_CXX # "Optional" because we want custom error message AX_CXX_COMPILE_STDCXX_11([noext], [optional]) if test x"$HAVE_CXX11" != x1; then - AC_MSG_ERROR([Either upgrade your compiler, or use ZNC 1.4]) + AC_MSG_ERROR([Upgrade your compiler. GCC 4.7+ and Clang 3.2+ are known to work.]) fi AC_PROG_INSTALL