From ef30967953b27cd8582646dee09ae4ae360288e0 Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com>
Date: Mon, 19 Dec 2011 13:41:35 -0500
Subject: [PATCH] [ #7901 ] Cleanup the changes
---
src/Call.cpp | 2 +-
src/CallModel.hpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Call.cpp b/src/Call.cpp
index 95912c67..43913a8d 100644
--- a/src/Call.cpp
+++ b/src/Call.cpp
@@ -493,7 +493,7 @@ call_state Call::actionPerformed(call_action action)
if (previousState < 11 && action < 5) {
changeCurrentState(actionPerformedStateMap[previousState][action]);
//execute the action associated with this transition
- (this->*(actionPerformedFunctionMap[previousState][action]))(); //WARNING BUG //WARNING SEGFAULT //TODO remove this node, it was not a good idea, it is not stable
+ (this->*(actionPerformedFunctionMap[previousState][action]))();
qDebug() << "Calling action " << action << " on call with state " << previousState << ". Become " << m_CurrentState;
//return the new state
}
diff --git a/src/CallModel.hpp b/src/CallModel.hpp
index f7dd95f0..f19081c5 100644
--- a/src/CallModel.hpp
+++ b/src/CallModel.hpp
@@ -277,8 +277,9 @@ template<typename CallWidget, typename Index> void CallModel<CallWidget,Index>::
///Transfer this call to "target" number
template<typename CallWidget, typename Index> void CallModel<CallWidget,Index>::transfer(Call* toTransfer, QString target)
{
- qDebug() << "Transferring call " << target;
+ qDebug() << "\n\n\n\n\nTransferring call " << toTransfer->getCallId() << target << "\n\n\n\n\n";
toTransfer->setTransferNumber(target);
+ toTransfer->changeCurrentState(CALL_STATE_TRANSFER);
toTransfer->actionPerformed(CALL_ACTION_ACCEPT);
toTransfer->changeCurrentState(CALL_STATE_OVER);
}
--
GitLab