Diff: call_manager.cpp

Revision:

82:f55d13babca0

Parent:

81:3656f00ab3db

Child:

91:c2a86b1f8aaa

--- a/call_manager.cpp	Tue Dec 30 12:37:40 2014 +0000
+++ b/call_manager.cpp	Tue Dec 30 21:00:00 2014 +0000
@@ -134,8 +134,10 @@
             }break;
             case cb_ringing : {
                 call = cb->invite();
-            
-                if( call != NULL ){
+                
+                if( cb->get_sip_status() == sip_busy ){
+                    cb->cb_set_status( cb_busy );
+                }else if( call != NULL ){
                     if( __find_Call__( v_call, call->get_cb_ext() ) == NULL ) v_call -> add( call );
                     
                     if( cb->get_sip_status() == sip_on_call ){
@@ -152,8 +154,6 @@
                         cb->set_invite_response_pending();
                         
                         if( debug_invite ) debug_msg( "-- ringing -- accepting call request --" );
-                    }else if( cb->get_sip_status() == sip_busy ){
-                        cb->cb_set_status( cb_busy );
                     }
                 }else{
                     if( cb->get_sip_status() == sip_denied ) cb->cb_set_status( cb_denied );