Ephoto: Update label for config directory setting. Fix crash while changing directories in single view.
Fixes https://phab.enlightenment.org/T4440 Maniphest Tasks: https://phab.enlightenment.org/T4440
This commit is contained in:
parent
4a5cb632ec
commit
5d94c9529a
|
@ -127,7 +127,7 @@ _config_general(Ephoto *ephoto, Evas_Object *parent)
|
||||||
ephoto->config->smooth_scale = check;
|
ephoto->config->smooth_scale = check;
|
||||||
|
|
||||||
label = elm_label_add(table);
|
label = elm_label_add(table);
|
||||||
elm_object_text_set(label, _("Directory To Open Ephoto In:"));
|
elm_object_text_set(label, _("Top Level Directory"));
|
||||||
evas_object_size_hint_align_set(label, 0.5, 0.5);
|
evas_object_size_hint_align_set(label, 0.5, 0.5);
|
||||||
elm_table_pack(table, label, 0, 5, 1, 1);
|
elm_table_pack(table, label, 0, 5, 1, 1);
|
||||||
evas_object_show(label);
|
evas_object_show(label);
|
||||||
|
|
|
@ -2108,21 +2108,11 @@ ephoto_single_browser_entry_set(Evas_Object *obj, Ephoto_Entry *entry)
|
||||||
Ephoto_Viewer *v;
|
Ephoto_Viewer *v;
|
||||||
Ephoto_History *eh;
|
Ephoto_History *eh;
|
||||||
Evas_Coord w, h;
|
Evas_Coord w, h;
|
||||||
char *dir;
|
|
||||||
|
|
||||||
if (sb->entry && !entry)
|
if (!entry)
|
||||||
{
|
sb->entry = NULL;
|
||||||
dir = ecore_file_dir_get(sb->entry->path);
|
else if (entry)
|
||||||
if (!eina_streq(sb->ephoto->config->directory, dir))
|
|
||||||
{
|
|
||||||
sb->entry = entry;
|
sb->entry = entry;
|
||||||
}
|
|
||||||
free(dir);
|
|
||||||
}
|
|
||||||
if (entry)
|
|
||||||
{
|
|
||||||
sb->entry = entry;
|
|
||||||
}
|
|
||||||
_ephoto_single_browser_recalc(sb);
|
_ephoto_single_browser_recalc(sb);
|
||||||
if (sb->edited_image_data)
|
if (sb->edited_image_data)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue