From dc915713ddff987e45a957c92f9a837e3b0438ae Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 29 Sep 2016 11:46:37 +0200 Subject: [PATCH] Simplify task_push_overlay_load_default --- tasks/task_overlay.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c index 5eb6112a4e..f7c5e7bc40 100644 --- a/tasks/task_overlay.c +++ b/tasks/task_overlay.c @@ -785,19 +785,11 @@ bool task_push_overlay_load_default( { settings_t *settings = config_get_ptr(); bool osk_enable = input_driver_is_onscreen_keyboard_enabled(); + const char *path = osk_enable ? settings->path.osk_overlay : + settings->path.overlay; - if (osk_enable) - { - if (!*settings->path.osk_overlay) - return false; - } - else - { - if (!*settings->path.overlay) - return false; - } + if (string_is_empty(path)) + return false; - return task_push_overlay_load( - osk_enable ? settings->path.osk_overlay : settings->path.overlay, - cb, user_data); + return task_push_overlay_load(path, cb, user_data); }