You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

24 lines
882 B

  1. From 703a244b9b8c1b4af02a6132c5c70a748d98e3f8 Mon Sep 17 00:00:00 2001
  2. From: J-P Nurmi <jpnurmi@gmail.com>
  3. Date: Tue, 28 Apr 2015 10:00:55 +0200
  4. Subject: [PATCH] Fix #954: Startup failure when simple_away is loaded
  5. after awaynick
  6. ---
  7. src/User.cpp | 5 +++++
  8. 1 file changed, 5 insertions(+)
  9. --- a/src/User.cpp
  10. +++ b/src/User.cpp
  11. @@ -1101,6 +1101,11 @@ bool CUser::LoadModule(const CString& sM
  12. CFile fNVFile = CFile(GetUserPath() + "/moddata/" + sModName + "/.registry");
  13. for (vector<CIRCNetwork*>::iterator it = m_vIRCNetworks.begin(); it != m_vIRCNetworks.end(); ++it) {
  14. + // Check whether the network already has this module loaded (#954)
  15. + if ((*it)->GetModules().FindModule(sModName)) {
  16. + continue;
  17. + }
  18. +
  19. if (fNVFile.Exists()) {
  20. CString sNetworkModPath = (*it)->GetNetworkPath() + "/moddata/" + sModName;
  21. if (!CFile::Exists(sNetworkModPath)) {