fix the issue power off media-server deadlock

Change-Id: I93cb5063b80254b0ac6534dfc9dc31c77a74f93b

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 8d869dc..5b9188b 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.3.18
+Version:    0.3.19
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
old mode 100644 (file)
new mode 100755 (executable)
index 9628055..1493856
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -304,6 +304,7 @@ void _ms_signal_handler(int n)
                } else if (pid == scanner_pid) {
                        MS_DBG_WARN("[%d] Scanner is stopped by media-server", pid);
                        ms_reset_scanner_status();
+                       ms_cleanup_scanner();
                } else if (pid == dcm_pid) {
                        MS_DBG_WARN("[%d] DCM is stopped by media-server", pid);
                        ms_dcm_reset_server_status();