adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-08 09:52:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.6.x'

Browse Source 
Conflicts:
	modules/bouncedcc.cpp
This commit is contained in:
J-P Nurmi
2015-09-20 23:36:44 +02:00
parent c83a41ce89 c8ab811a29
commit e879203d54
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/route_replies.cpp
+3 -2
View File
@@ -218,7 +218,7 @@ public:
AddHelpCommand();
AddCommand("Silent", static_cast<CModCommand::ModCmdFunc>(&CRouteRepliesMod::SilentCommand),
"[yes|no]");
"[yes|no]", "Decides whether to show the timeout messages or not");
}
virtual ~CRouteRepliesMod() {
@@ -369,7 +369,8 @@ public:
// The timer will be deleted after this by the event loop
if (!GetNV("silent_timeouts").ToBool()) {
PutModule("This module hit a timeout which is possibly a bug.");
PutModule("This module hit a timeout which is probably a connectivity issue.");
PutModule("However, if you can provide steps to reproduce this issue, please do report a bug.");
PutModule("To disable this message, do \"/msg " + GetModNick()
+ " silent yes\"");
PutModule("Last request: " + m_sLastRequest);