]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
update
authorAnthony Minessale <anthony.minessale@gmail.com>
Thu, 26 Oct 2006 16:31:05 +0000 (16:31 +0000)
committerAnthony Minessale <anthony.minessale@gmail.com>
Thu, 26 Oct 2006 16:31:05 +0000 (16:31 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3213 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/switch_ivr.c

index 7e7e3296f45ca3a7bf8ee78b88e6a60649b08194..257d4612658c7a63305565bbe94cf01ebf70d26f 100644 (file)
@@ -1932,7 +1932,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                
                                if ((time(NULL) - start) > (time_t)timelimit_sec) {
                                        to++;
-                                       break;
+                                       idx = IDX_CANCEL;
+                                       goto notready;
                                }
                                switch_yield(1000);
                        }
@@ -1978,7 +1979,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                           check_channel_status(peer_channels, peer_sessions, and_argc, &idx, file, key)) {
 
                        if ((to = (uint8_t)((time(NULL) - start) >= (time_t)timelimit_sec))) {
-                               break;
+                               idx = IDX_CANCEL;
+                               goto notready;
                        }
 
                        if (session && or_argc == 1 && and_argc == 1) { /* when there is only 1 channel to call and bridge */