From b36ad82da778f402d7bc34088f39b8d2c2953a17 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Wed, 3 Apr 2013 20:34:55 +0200 Subject: [PATCH] Don't create a new session when pressing speeddial Fixes #FS-5259 (Thanks to Nathan Neulinger for the patch) --- build/modules.conf.in | 2 +- libs/spandsp/src/cielab_luts.h | 6 +++--- src/mod/endpoints/mod_skinny/skinny_server.c | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build/modules.conf.in b/build/modules.conf.in index 39071369fa..a8064ad2b8 100644 --- a/build/modules.conf.in +++ b/build/modules.conf.in @@ -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 diff --git a/libs/spandsp/src/cielab_luts.h b/libs/spandsp/src/cielab_luts.h index 0a3c697915..b3bc75f662 100644 --- a/libs/spandsp/src/cielab_luts.h +++ b/libs/spandsp/src/cielab_luts.h @@ -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] = diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c index 21bdf08a2b..6f8cf46553 100644 --- a/src/mod/endpoints/mod_skinny/skinny_server.c +++ b/src/mod/endpoints/mod_skinny/skinny_server.c @@ -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); }