]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
fix regression in commit 98f74a5f FS-2965
authorAnthony Minessale <anthm@freeswitch.org>
Thu, 13 Jan 2011 16:41:33 +0000 (10:41 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Thu, 13 Jan 2011 16:41:33 +0000 (10:41 -0600)
src/mod/applications/mod_conference/mod_conference.c

index 6bdb5680fc7588d068de4f242d2b1166c3eaa895..2d9341a5989300452730404ade00ea9baf36c7e4 100644 (file)
@@ -5046,7 +5046,7 @@ static switch_status_t conference_local_play_file(conference_obj_t *conference,
                        goto done;
                }
 
-               if (conference->sound_prefix) {
+               if (!switch_is_file_path(path) && conference->sound_prefix) {
                        if (!(dpath = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, path))) {
                                status = SWITCH_STATUS_MEMERR;
                                goto done;
@@ -5827,7 +5827,7 @@ SWITCH_STANDARD_APP(conference_function)
                                toplay = conference->kicked_sound; 
                        }
 
-                       if (conference->sound_prefix) {
+                       if (!switch_is_file_path(toplay) && conference->sound_prefix) {
                                dfile = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, toplay);
                                switch_assert(dfile);
                                toplay = dfile;