rui: Fix menu description reset

Descriptions in submenus were reset to main menu value. This commit
fixes it.

Change-Id: I75e503d7cfd0515caa7a25956169cc892d6431aa
Signed-off-by: Paweł Szewczyk <p.szewczyk@samsung.com>

diff --git a/src/system-recovery/recovery-main.c b/src/system-recovery/recovery-main.c
index 1446b79bdb7b7f6f0097c7a06264d473b2dda510..bda457e57fd03bda477d01164281384a62c4b568 100644 (file)
--- a/src/system-recovery/recovery-main.c
+++ b/src/system-recovery/recovery-main.c
@@ -83,12 +83,15 @@ char *get_action_from_file(void)
        int ret;
 
        fp = fopen(SYSTEM_RECOVERY_ACTION_FILE, "r");
-       if (!fp)
+       if (!fp) {
+               LOGD("Could not open recovery action file\n");
                return NULL;
+       }
 
        ret = fscanf(fp, "%" STR(ACTION_BUFFER_SIZE) "s", buf);
        fclose(fp);
-       unlink(SYSTEM_RECOVERY_ACTION_FILE);
+       if (unlink(SYSTEM_RECOVERY_ACTION_FILE) < 0)
+               LOGD("Could not unlink recovery action file: %m\n");
 
        if (ret != 1)
                return NULL;

diff --git a/src/system-recovery/recovery-rui.c b/src/system-recovery/recovery-rui.c
index 777f6919c9fb2179470fb1d119cdbcf8620236f1..37c4dd5679a4621f24c71d6f573e292f8e7a927e 100644 (file)
--- a/src/system-recovery/recovery-rui.c
+++ b/src/system-recovery/recovery-rui.c
@@ -73,8 +73,9 @@ static void timeout_handler(rui_screen *cs)
                }
        }
 
-       if (!user_idle) {
+       if (original_description && !user_idle) {
                cs->description->text = original_description;
+               original_description = NULL;
        }
 
        timer_count++;