SeanOMik
/
znc-push
mirror of https://github.com/SeanOMik/znc-push.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #233 from dgw/safe-blank-user 

Don't crash when sending a push when user has no networks
This commit is contained in:
John Reese 2017-06-29 20:25:54 -07:00 committed by GitHub
parent aa4c576a2b 3477d71f6f
commit ad20898554
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
push.cpp
View File

@ -259,8 +259,14 @@ class CPushMod : public CModule
replace["{title}"] = title; replace["{title}"] = title;
replace["{username}"] = options["username"]; replace["{username}"] = options["username"];
replace["{secret}"] = options["secret"]; replace["{secret}"] = options["secret"];
replace["{network}"] = GetNetwork()->GetName();
replace["{target}"] = options["target"]; replace["{target}"] = options["target"];
// network is special because it can be nullptr if the user has none set up yet
CIRCNetwork* network = GetNetwork();
if (network) {
replace["{network}"] = network->GetName();
} else {
replace["{network}"] = "(No network)";
}
CString message_uri = expand(options["message_uri"], replace); CString message_uri = expand(options["message_uri"], replace);
CString message_title = expand(options["message_title"], replace); CString message_title = expand(options["message_title"], replace);