]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Don't create a new session when pressing speeddial
authorMathieu Parent <math.parent@gmail.com>
Wed, 3 Apr 2013 18:34:55 +0000 (20:34 +0200)
committerNathan Neulinger <nneul@neulinger.org>
Fri, 31 May 2013 20:10:42 +0000 (15:10 -0500)
Fixes #FS-5259 (Thanks to Nathan Neulinger for the patch)

build/modules.conf.in
libs/spandsp/src/cielab_luts.h
src/mod/endpoints/mod_skinny/skinny_server.c

index 39071369faf3d9e45ff5676348b6660b13ac7051..a8064ad2b8ec21b768ca89abbd3a82b4e9d496dc 100644 (file)
@@ -79,7 +79,7 @@ endpoints/mod_loopback
 #endpoints/mod_opal
 #endpoints/mod_portaudio
 #endpoints/mod_rtmp
-#endpoints/mod_skinny
+endpoints/mod_skinny
 #endpoints/mod_skypopen
 endpoints/mod_sofia
 event_handlers/mod_cdr_csv
index 0a3c69791532c7605f5bc8825ce8f20f89bc8afa..b3bc75f6628a526c5e0d4121ea7385ae40a6b27a 100644 (file)
@@ -140,7 +140,7 @@ static const float srgb_to_linear[256] =
     0.248036,
     0.251995,
     0.255990,
-    0.260022,
+    0.260021,
     0.264090,
     0.268196,
     0.272338,
@@ -239,7 +239,7 @@ static const float srgb_to_linear[256] =
     0.831396,
     0.839397,
     0.847443,
-    0.855534,
+    0.855533,
     0.863669,
     0.871850,
     0.880075,
@@ -254,7 +254,7 @@ static const float srgb_to_linear[256] =
     0.956143,
     0.964823,
     0.973548,
-    0.982319,
+    0.982320,
     0.991137
 };
 static const uint8_t linear_to_srgb[4096] =
index 21bdf08a2be701af04e1f45b379bb3081ad8ae2c..6f8cf46553a7f26b38996f1a3d4644525b142368 100644 (file)
@@ -1219,7 +1219,9 @@ switch_status_t skinny_handle_stimulus_message(listener_t *listener, skinny_mess
                        break;
                case SKINNY_BUTTON_SPEED_DIAL:
                        skinny_speed_dial_get(listener, request->data.stimulus.instance, &button_speed_dial);
-                       if(strlen(button_speed_dial->line) > 0) {
+
+                       session = skinny_profile_find_session(listener->profile, listener, &line_instance, 0);
+                       if(!session && strlen(button_speed_dial->line) > 0) {
                                skinny_create_incoming_session(listener, &line_instance, &session);
                                skinny_session_process_dest(session, listener, line_instance, button_speed_dial->line, '\0', 0);
                        }