From ec1202daf370f6fb279f52f590b0e24d709a8a0a Mon Sep 17 00:00:00 2001 From: Kyle Fuller Date: Tue, 14 Feb 2012 11:48:46 +0000 Subject: [PATCH] {unload,reload}mod: Don't get modinfo if the type is defined This allows us to unload a module if we supply the type and mod info cannot be loaded (such as if the module file has been moved). --- src/ClientCommand.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ClientCommand.cpp b/src/ClientCommand.cpp index 0f53cc43..5d410139 100644 --- a/src/ClientCommand.cpp +++ b/src/ClientCommand.cpp @@ -846,14 +846,14 @@ void CClient::UserCommand(CString& sLine) { return; } - CModInfo ModInfo; - CString sRetMsg; - if (!CZNC::Get().GetModules().GetModInfo(ModInfo, sMod, sRetMsg)) { - PutStatus("Unable to find modinfo [" + sMod + "] [" + sRetMsg + "]"); - return; - } - if (sType.Equals("default")) { + CModInfo ModInfo; + CString sRetMsg; + if (!CZNC::Get().GetModules().GetModInfo(ModInfo, sMod, sRetMsg)) { + PutStatus("Unable to find modinfo [" + sMod + "] [" + sRetMsg + "]"); + return; + } + eType = ModInfo.GetDefaultType(); } @@ -915,14 +915,14 @@ void CClient::UserCommand(CString& sLine) { return; } - CModInfo ModInfo; - CString sRetMsg; - if (!CZNC::Get().GetModules().GetModInfo(ModInfo, sMod, sRetMsg)) { - PutStatus("Unable to find modinfo for [" + sMod + "] [" + sRetMsg + "]"); - return; - } - if (sType.Equals("default")) { + CModInfo ModInfo; + CString sRetMsg; + if (!CZNC::Get().GetModules().GetModInfo(ModInfo, sMod, sRetMsg)) { + PutStatus("Unable to find modinfo for [" + sMod + "] [" + sRetMsg + "]"); + return; + } + eType = ModInfo.GetDefaultType(); }