yakov pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=dbe7bb7bd32c635b60ad3acd64b93419d368e8a0

commit dbe7bb7bd32c635b60ad3acd64b93419d368e8a0
Author: Yakov Goldberg <yako...@samsung.com>
Date:   Thu Dec 10 16:41:08 2015 +0200

    Fileselector entry: fix a case when file was not selected
    
    Expected behavior: when Cancel or X is pressed in Filesector
    don't change entry.
    Wrong behavior: entry is cleaned.
    If no file was selected 'file' variable is NULL,
    and elm_entry_utf8_to_markup(NULL) returns empty string.
    Thus this empty string was set to entry.
    
    @fix
---
 src/lib/elc_fileselector_entry.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index ba06a6f..e998c43 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -73,10 +73,10 @@ _FILE_CHOSEN_fwd(void *data,
    const char *file = event_info;
    char *s;
 
+   if (!file) return EINA_TRUE;
    ELM_FILESELECTOR_ENTRY_DATA_GET(data, sd);
 
    s = elm_entry_utf8_to_markup(file);
-   if (!s) return EINA_TRUE;
    elm_object_text_set(sd->entry, s);
    free(s);
    eo_do(data, eo_event_callback_call

-- 


Reply via email to