From 3931857e6d7eeb07410e6b1c11be682040613d31 Mon Sep 17 00:00:00 2001 From: zoltanvb Date: Tue, 7 Apr 2026 21:00:07 +0200 Subject: [PATCH] Small fixes for scan rework - set recursive setting to off if content dir points to a file (can happen when scan menu is opened after a playlist refresh) - fix a crash that can also happen when scan menu is opened after playlist refresh --- manual_content_scan.c | 3 +++ menu/cbs/menu_cbs_deferred_push.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/manual_content_scan.c b/manual_content_scan.c index 5803ad9dd1ec..ed23899ee6c3 100644 --- a/manual_content_scan.c +++ b/manual_content_scan.c @@ -1290,7 +1290,10 @@ bool manual_content_scan_get_task_config( return false; if (!path_is_directory(scan_settings.content_dir)) + { scan_settings.scan_single_file = true; + scan_settings.search_recursively = false; + } else scan_settings.scan_single_file = false; diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 1675df536962..884da928bfc7 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -398,7 +398,7 @@ static int general_push(menu_displaylist_info_t *info, if (!valid_extensions) valid_extensions = info->exts; - if (*valid_extensions) + if (valid_extensions && *valid_extensions) { CHECK_SIZE(strlen(valid_extensions) + 12); _len += strlcpy(newstr2 + _len, valid_extensions, size - _len);