From f674dd47d4d3d9c0bb83c804fcef1f0911c25864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ben=20Gr=C3=A4f?= <ben@gra3f.de>
Date: Sat, 26 Oct 2019 15:17:36 +0200
Subject: [PATCH] Fixed Segfault when stopping server

---
 config_cc.json     | 20 ++++++++++++++++++++
 src/cc/Service.cpp |  5 ++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 config_cc.json

diff --git a/config_cc.json b/config_cc.json
new file mode 100644
index 00000000..04ec6d4f
--- /dev/null
+++ b/config_cc.json
@@ -0,0 +1,20 @@
+{
+  "background": false,                            // true to run the cc-server in the background (no console)
+  "colors": true,                                 // false to disable colored output
+  "log-file": null,                               // log all output to a file
+  "syslog": false,                                // use system log for output messages
+  "port": 1234,                               // port the CC Server will listens on
+  "use-tls" : false,                          // use tls for CC communication (needs to be enabled on miners too)
+  "cert-file" : "server.pem",                 // when tls is turned on, use this to point to the right cert file
+  "key-file" : "server.key",                  // when tls is turned on, use this to point to the right key file
+  "access-token": "P5häe7©'[*CKq{X7§^G{YI}6ê@I0z0ml3O<P}6Ã-1u3Y}±l0©?cO®3Ê.qS!&)]gZ",                 // access token for CC Clients (should be set!!!)
+  "user": "bendr0id",                            // admin user for access CC Dashboard
+  "pass": "¯S()#Eñ+w5rK2Ii0",                             // admin pass for access CC Dashboard
+  "client-config-folder" : null,              // folder which contains the client-config files (null=current)
+  "custom-dashboard" : "index.html",           // dashboard html file
+  "pushover-user-key" : "uxcyjgczey66k4rnyb2e3etbiu9dwy",                       // username to use for pushover notifications
+  "pushover-api-token" : "awgbtuod8r638ipxywdagwhgrmpbpt",                      // token to use for pushover notifications
+  "push-miner-offline-info" : true,           // push notification for offline miners
+  "push-miner-zero-hash-info" : true,         // push notification for offline miners
+  "push-periodic-mining-status" : true        // push periodic (every hour) status notification
+}
diff --git a/src/cc/Service.cpp b/src/cc/Service.cpp
index 04221d9d..39c4260e 100644
--- a/src/cc/Service.cpp
+++ b/src/cc/Service.cpp
@@ -92,7 +92,10 @@ void Service::stop()
 {
   std::lock_guard<std::mutex> lock(m_mutex);
 
-  m_timer->stop();
+  if (m_timer)
+  {
+    m_timer->stop();
+  }
 
   m_clientCommand.clear();
   m_clientStatus.clear();