]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-10169: [mod_local_stream] When using local stream commands FreeSWITCH locks up...
authorBrian West <brian@freeswitch.org>
Thu, 20 Apr 2017 17:28:45 +0000 (12:28 -0500)
committerMike Jerris <mike@jerris.com>
Tue, 30 May 2017 20:45:56 +0000 (16:45 -0400)
src/mod/formats/mod_local_stream/mod_local_stream.c

index fe1bc93e89deadf8e2886ec527e8a551e1313b09..3c8e5f72bf976b1088a02c4f8ebb1d2aa493d9fd 100644 (file)
@@ -733,13 +733,12 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void
                                        }
                                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "local_stream://%s partially reloaded.\n",source->name);
                                        source->part_reload = 0;
-                                       if (source->timer.interval) {
-                                               switch_core_timer_destroy(&source->timer);
-                                       }
+                                       source->full_reload = 0;
                                }
                        } else {
                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "local_stream://%s fully reloaded.\n",source->name);
                                switch_thread_rwlock_unlock(source->rwlock);
+                               source->full_reload = 0;
                                launch_streams(source->name);
                                goto done;
                        }