fix SVACE issue 64/106064/1
authorYong Yeon Kim <yy9875.kim@samsung.com>
Sat, 17 Dec 2016 11:45:26 +0000 (20:45 +0900)
committerbeibei zhao <beibei.zhao@samsung.com>
Tue, 20 Dec 2016 09:34:31 +0000 (01:34 -0800)
Change-Id: I2dc0d9de67b9a4464a9ebf6cb13902f381c3e8dc
(cherry picked from commit 2973ae3a89395e616f254f4787289e3342b7a3fc)

packaging/media-server.spec
src/server/media-server-main.c

index 19e1834..620acfb 100755 (executable)
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.3.25
+Version:    0.3.26
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0
index e58514d..b98960c 100755 (executable)
@@ -715,7 +715,7 @@ static int __ms_check_disc_status(void)
                        ret = ms_load_functions();
                        if (ret != MS_MEDIA_ERR_NONE) {
                                MS_DBG_ERR("ms_load_functions failed [%d]", ret);
-                               return;
+                               goto END;
                        }
 
                        /* request scanning */
@@ -744,6 +744,7 @@ static int __ms_check_disc_status(void)
                                ret = ms_insert_storage(handle, DATADISC_STORAGE_ID, NULL, mnt_path, uid);
                                if (ret != MS_MEDIA_ERR_NONE) {
                                        MS_DBG_ERR("ms_insert_storage failed");
+                                       ms_unload_functions();
                                        goto END;
                                }
                        }