diff options
| author | Paweł Szewczyk <p.szewczyk@samsung.com> | 2017-10-16 13:54:56 +0200 |
|---|---|---|
| committer | Paweł Szewczyk <p.szewczyk@samsung.com> | 2017-10-16 14:42:45 +0200 |
| commit | b67f342561b502823a9bfaa29b5f74607699e9a2 (patch) | |
| tree | 36eba46e8568742ae42074777afa516ecfad4c48 | |
| parent | d447651310ae1dbee7467c8174b76ed6bb478101 (diff) | |
| download | initrd-recovery-b67f342561b502823a9bfaa29b5f74607699e9a2.tar.gz initrd-recovery-b67f342561b502823a9bfaa29b5f74607699e9a2.tar.bz2 initrd-recovery-b67f342561b502823a9bfaa29b5f74607699e9a2.zip | |
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>
| -rw-r--r-- | src/system-recovery/recovery-main.c | 7 | ||||
| -rw-r--r-- | src/system-recovery/recovery-rui.c | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/system-recovery/recovery-main.c b/src/system-recovery/recovery-main.c index 1446b79..bda457e 100644 --- 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 777f691..37c4dd5 100644 --- 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++; |