Allow softkey reject while device onhook.
authorDamien Wedhorn <voip@facts.com.au>
Sun, 29 Jan 2012 22:33:08 +0000 (22:33 +0000)
committerDamien Wedhorn <voip@facts.com.au>
Sun, 29 Jan 2012 22:33:08 +0000 (22:33 +0000)
Fixes up softkey endcall. Previous code was a copy of onhook, now
allows for endcall softkey to be used while device is still onhook.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@353224 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_skinny.c

index ab96733..5fa3236 100644 (file)
@@ -6507,13 +6507,6 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                if (skinnydebug)
                        ast_verb(1, "Received Softkey Event: End Call(%d/%d)\n", instance, callreference);
 
-               if (d->hookstate == SKINNY_ONHOOK) {
-                       /* Something else already put us back on hook */
-                       /* Not ideal, but let's send updated time anyway, as it clears the display */
-                       transmit_definetimedate(d);
-                       return 0;
-               }
-
                if (l->transfer && sub && sub->xferor && sub->owner->_state >= AST_STATE_RING) {
                        /* We're allowed to transfer, we have two active calls and
                            we made at least one of the calls.  Let's try and transfer */