From 5759135ad3e064aa33899dd805ec17aad17c1697 Mon Sep 17 00:00:00 2001 From: Stephen 'Okra' Houston Date: Fri, 5 May 2017 11:08:15 -0500 Subject: [PATCH] Ephoto: Fix a potential crash when switching directories in single view. --- src/bin/ephoto_single_browser.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c index 481eca3..282c753 100644 --- a/src/bin/ephoto_single_browser.c +++ b/src/bin/ephoto_single_browser.c @@ -2142,10 +2142,18 @@ ephoto_single_browser_entries_set(Evas_Object *obj, Eina_List *entries) elm_image_file_get(v->image, &image, NULL); dir = ecore_file_dir_get(image); - if (strcmp(sb->ephoto->config->directory, dir)) - ephoto_single_browser_entry_set(sb->main, + if (!dir) + { + ephoto_single_browser_entry_set(sb->main, _first_entry_find(sb)); - free(dir); + } + else + { + if (strcmp(sb->ephoto->config->directory, dir)) + ephoto_single_browser_entry_set(sb->main, + _first_entry_find(sb)); + free(dir); + } } else ephoto_single_browser_entry_set(sb->main,