From 3f6c820340139d3bc293001b17d006957a5f20dd Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Thu, 28 Feb 2013 17:44:28 +0100 Subject: * stability fix because of dbus interface of nsm Signed-off-by: Christian Linke --- AudioManagerDaemon/src/CAmNodeStateCommunicator.cpp | 6 +++++- AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/AudioManagerDaemon/src/CAmNodeStateCommunicator.cpp b/AudioManagerDaemon/src/CAmNodeStateCommunicator.cpp index a80e44b..01c4c6e 100644 --- a/AudioManagerDaemon/src/CAmNodeStateCommunicator.cpp +++ b/AudioManagerDaemon/src/CAmNodeStateCommunicator.cpp @@ -589,7 +589,11 @@ DBusHandlerResult CAmNodeStateCommunicator::signalCallback(DBusConnection* conn, { (void) conn; CAmNodeStateCommunicator* instance(static_cast(user_data)); - std::string interface = dbus_message_get_interface(msg); + + const char* iface = dbus_message_get_interface(msg); + if (iface==NULL) + return (DBUS_HANDLER_RESULT_NOT_YET_HANDLED); + std::string interface(iface); std::string member = dbus_message_get_member(msg); if (interface=="org.genivi.NodeStateManager.Consumer") diff --git a/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CMakeLists.txt b/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CMakeLists.txt index f5b9b6d..99b2963 100644 --- a/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmNodeStateCommunicatorTest/CMakeLists.txt @@ -100,7 +100,7 @@ INSTALL(FILES IF(USE_BUILD_LIBS) execute_process( - COMMAND mkdir -p "${EXECUTABLE_OUTPUT_PATH}" + COMMAND mkdir -p ${EXECUTABLE_OUTPUT_PATH} COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/org.genivi.NodeStateManager.Consumer.xml" ${EXECUTABLE_OUTPUT_PATH}/org.genivi.NodeStateManager.Consumer.xml COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/nsm.py" ${EXECUTABLE_OUTPUT_PATH}/nsm.py COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/send2nsm.py" ${EXECUTABLE_OUTPUT_PATH}/send2nsm.py) -- cgit v1.2.1