[svn-commits] wedhorn: trunk r353224 - /trunk/channels/chan_skinny.c

[SVN commits to the Digium repositories]

Author: wedhorn
Date: Sun Jan 29 16:33:08 2012
New Revision: 353224

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=353224
Log:
Allow softkey reject while device onhook.

Fixes up softkey endcall. Previous code was a copy of onhook, now
allows for endcall softkey to be used while device is still onhook.


Modified:
    trunk/channels/chan_skinny.c

Modified: trunk/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=353224&r1=353223&r2=353224
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Sun Jan 29 16:33:08 2012
@@ -6506,13 +6506,6 @@
 	case SOFTKEY_ENDCALL:
 		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