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>
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;
}
}
- if (!user_idle) {
+ if (original_description && !user_idle) {
cs->description->text = original_description;
+ original_description = NULL;
}
timer_count++;