GenericCommunicator: fixed crash during shutdown, if no ipcModule was loaded

the GenericCommunicator always tried to destroy the ipcModule. this failed
and resulted in a crash, if no ipcModule was loaded during startup.

diff --git a/LayerManagerPlugins/Communicators/GenericCommunicator/include/GenericCommunicator.h b/LayerManagerPlugins/Communicators/GenericCommunicator/include/GenericCommunicator.h
index 15d637a..55ba091 100644 (file)
--- a/LayerManagerPlugins/Communicators/GenericCommunicator/include/GenericCommunicator.h
+++ b/LayerManagerPlugins/Communicators/GenericCommunicator/include/GenericCommunicator.h
@@ -202,14 +202,12 @@ public:
     void SetUniforms();
 
 private:
-    IpcModule m_ipcModule;
-    CallBackTable m_callBackTable;
-    // TODO: void AddClientWatch(DBusConnection *conn, char* sender);
     void RemoveApplicationReference(char* owner);
 
-
+private:
+    IpcModule m_ipcModule;
+    CallBackTable m_callBackTable;
     bool m_running;
-
 };
 
 #endif /* _DBUSCOMMUNICATOR_H_ */

diff --git a/LayerManagerPlugins/Communicators/GenericCommunicator/src/GenericCommunicator.cpp b/LayerManagerPlugins/Communicators/GenericCommunicator/src/GenericCommunicator.cpp
index 856a71b..710341a 100644 (file)
--- a/LayerManagerPlugins/Communicators/GenericCommunicator/src/GenericCommunicator.cpp
+++ b/LayerManagerPlugins/Communicators/GenericCommunicator/src/GenericCommunicator.cpp
@@ -171,6 +171,8 @@ bool GenericCommunicator::start()
     }
     LOG_DEBUG("GenericCommunicator", "Initializing IpcModule success.");
 
+    m_running = ILM_TRUE;
+
     return ILM_TRUE;
 }
 
@@ -179,7 +181,10 @@ void GenericCommunicator::stop()
     LOG_ENTER_FUNCTION;
     LOG_INFO("GenericCommunicator","stopping");
 
-    m_ipcModule.destroy();
+    if (m_running)
+    {
+        m_ipcModule.destroy();
+    }
 }
 
 void GenericCommunicator::process(int timeout_ms)