From 3477d71f6f4723fb71149cf3c4eea6c994d19137 Mon Sep 17 00:00:00 2001 From: dgw Date: Thu, 29 Jun 2017 04:34:57 -0500 Subject: [PATCH] Don't crash when sending a push when user has no networks Fixes #231 --- push.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/push.cpp b/push.cpp index 5d9573d..31a7892 100755 --- a/push.cpp +++ b/push.cpp @@ -259,8 +259,14 @@ class CPushMod : public CModule replace["{title}"] = title; replace["{username}"] = options["username"]; replace["{secret}"] = options["secret"]; - replace["{network}"] = GetNetwork()->GetName(); 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_title = expand(options["message_title"], replace);