Merge branch 'master' of git+ssh://repos-sflphone-git@sflphone.org/~/sflphone

src/managerimpl.cpp

@@ -274,7 +274,7 @@ ManagerImpl::answerCall(const CallID& id)
     return false;
   }
 
-  if (hasCurrentCall()) {
+  if (id != getCurrentCallId()) {
     _debug("* Manager Info: there is currently a call, try to hold it\n");
     onHoldCall(getCurrentCallId());
   }