From 0ecee9b12bea7481d56ae9aa3291272dfe4d22e7 Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Mon, 11 Apr 2016 07:21:57 -0700 Subject: Remove assert from database and replace by error handling Signed-off-by: Christian Linke --- AudioManagerCore/src/CAmControlReceiver.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'AudioManagerCore/src/CAmControlReceiver.cpp') diff --git a/AudioManagerCore/src/CAmControlReceiver.cpp b/AudioManagerCore/src/CAmControlReceiver.cpp index c1c161e..662de85 100644 --- a/AudioManagerCore/src/CAmControlReceiver.cpp +++ b/AudioManagerCore/src/CAmControlReceiver.cpp @@ -70,7 +70,9 @@ am_Error_e CAmControlReceiver::connect(am_Handle_s & handle, am_connectionID_t & tempConnection.connectionID = 0; tempConnection.delay=-1; - mDatabaseHandler->enterConnectionDB(tempConnection, connectionID); + am_Error_e connError(mDatabaseHandler->enterConnectionDB(tempConnection, connectionID)); + if (connError) + return(connError); am_Error_e syncError(mRoutingSender->asyncConnect(handle, connectionID, sourceID, sinkID, format)); if (syncError) { @@ -217,7 +219,7 @@ am_Error_e CAmControlReceiver::changeSinkAvailabilityDB(const am_Availability_s am_Error_e CAmControlReceiver::changDomainStateDB(const am_DomainState_e domainState, const am_domainID_t domainID) { - return (mDatabaseHandler->changDomainStateDB(domainState, domainID)); + return (mDatabaseHandler->changeDomainStateDB(domainState, domainID)); } am_Error_e CAmControlReceiver::changeSinkMuteStateDB(const am_MuteState_e muteState, const am_sinkID_t sinkID) -- cgit v1.2.1