Avoid crash on storaged UI

Change-Id: Ib198495d8e69238fb526f772a9aea835634490c3
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>
(cherry picked from commit 901aa8553f31b6f4d278b8d659450fb36cf84be5)

diff --git a/apps/extended-sd/src/es-internal-storage-page.c b/apps/extended-sd/src/es-internal-storage-page.c
index 9047ce7f3acc5d3dbbc6a79b8f93b6fc794e0496..65ab94c9176610bdc7919f8215644c934efd6e7c 100644 (file)
--- a/apps/extended-sd/src/es-internal-storage-page.c
+++ b/apps/extended-sd/src/es-internal-storage-page.c
@@ -67,6 +67,7 @@ mapper_device_cb(int id, storage_dev_e dev, storage_state_e state,
        if (state == STORAGE_STATE_REMOVED) {
                DMSG("Storage is removed");
                ui_app_exit();
+               return;
        } else if (state == STORAGE_STATE_UNMOUNTABLE)
                return;
 

diff --git a/src/block/block.c b/src/block/block.c
index 89b553af5260b513aedebf89b4ed724655dbc169..1bfcc19cc913f68b3f84a04e9be41234c7b94ba8 100644 (file)
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -3058,12 +3058,15 @@ static DBusMessage *request_format_block_type(dbus_method_reply_handle_h reply_h
                                goto out;
                        }
 
-                       for (wait = 0; wait < 5; wait++) {
+                       for (wait = 0; wait < 10; wait++) {
                                if (!access(EXTENDEDSD_NODE_PATH, F_OK))
                                        sleep(1);
                                else
                                        break;
                        }
+
+                       if (wait == 10)
+                               _E("Timeout for checking access(EXTENDEDSD_NODE_PATH, F_OK)");
                }
 
                ret = update_block_data(bdev->data,