From 42da518d5fcda9fd3c0f00f35a656d459f0b7508 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Wed, 22 May 2019 15:16:38 +0200
Subject: [PATCH] Fixed ERROR message when force-saving connector list to
 shared memory.

---
 src/controller/controller_connectors.cpp | 14 ++++++++++----
 src/controller/controller_connectors.h   |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/controller/controller_connectors.cpp b/src/controller/controller_connectors.cpp
index cdd7edab..b3762c15 100644
--- a/src/controller/controller_connectors.cpp
+++ b/src/controller/controller_connectors.cpp
@@ -23,11 +23,17 @@ namespace Controller {
   static std::map<std::string, pid_t> currentConnectors; ///<The currently running connectors.
 
   /// Updates the shared memory page with active connectors
-  void saveActiveConnectors(){
-    IPC::sharedPage f("MstCnns", 4096, true, false);
+  void saveActiveConnectors(bool forceOverride){
+    IPC::sharedPage f("MstCnns", 4096, forceOverride, false);
     if (!f.mapped){
-      FAIL_MSG("Could not store connector data!");
-      return;
+      if (!forceOverride){
+        saveActiveConnectors(true);
+        return;
+      }
+      if (!f.mapped){
+        FAIL_MSG("Could not store connector data!");
+        return;
+      }
     }
     memset(f.mapped, 0, 32);
     Util::RelAccX A(f.mapped, false);
diff --git a/src/controller/controller_connectors.h b/src/controller/controller_connectors.h
index e48ff308..75e7da5c 100644
--- a/src/controller/controller_connectors.h
+++ b/src/controller/controller_connectors.h
@@ -9,7 +9,7 @@ namespace Controller {
   bool CheckProtocols(JSON::Value & p, const JSON::Value & capabilities);
 
   /// Updates the shared memory page with active connectors
-  void saveActiveConnectors();
+  void saveActiveConnectors(bool forceOverride = false);
 
   /// Reads active connectors from the shared memory pages
   void loadActiveConnectors();