[svn-commits] qwell: trunk r56574 - in /trunk: ./ channels/chan_skinny.c

[svn-commits at lists.digium.com]

Author: qwell
Date: Fri Feb 23 20:04:34 2007
New Revision: 56574

URL: http://svn.digium.com/view/asterisk?view=rev&rev=56574
Log:
Merged revisions 56569 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r56569 | qwell | 2007-02-23 20:02:53 -0600 (Fri, 23 Feb 2007) | 4 lines

Make sure to set a speeddials parent on creation.
Don't crash if hold is pressed when no call is active.
Don't return in places that we shouldn't..
Update softkey map when call is connected

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_skinny.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=56574&r1=56573&r2=56574
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Fri Feb 23 20:04:34 2007
@@ -2108,6 +2108,8 @@
 						ast_copy_string(sd->label, exten, sizeof(sd->label));
 					sd->instance = speeddialInstance++;
 
+					sd->parent = d;
+
 					sd->next = d->speeddials;
 					d->speeddials = sd;
 				}
@@ -2466,6 +2468,7 @@
 	   or you won't get keypad messages in some situations. */
 	transmit_callinfo(s, ast->cid.cid_name, ast->cid.cid_num, ast->exten, ast->exten, l->instance, sub->callid, 2);
 	transmit_callstate(s, l->instance, SKINNY_CONNECTED, sub->callid);
+	transmit_selectsoftkeys(s, l->instance, sub->callid, KEYDEF_CONNECTED);
 	transmit_displaypromptstatus(s, "Connected", 0, l->instance, sub->callid);
 	return res;
 }
@@ -3086,6 +3089,9 @@
 		if (skinnydebug)
 			ast_verbose("Received Stimulus: Hold(%d)\n", instance);
 
+		if (!sub)
+			break;
+
 		if (sub->onhold) {
 			skinny_unhold(sub);
 		} else {
@@ -3757,7 +3763,7 @@
 
 			if (ast_strlen_zero(l->lastnumberdialed)) {
 				ast_log(LOG_WARNING, "Attempted redial, but no previously dialed number found.\n");
-				return 0;
+				break;
 			}
 			if (!ast_ignore_pattern(c->context, l->lastnumberdialed)) {
 				transmit_tone(s, SKINNY_SILENCE);
@@ -3876,7 +3882,7 @@
 					}
 				} else if (res) {
 					ast_log(LOG_WARNING, "Transfer attempt failed\n");
-					return 0;
+					break;
 				}
 #endif
 			} else {