aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-09-18 09:20:49 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-09-18 09:20:49 +0000
commitd18751ac7f959d95d0981afeb33ab9fcc998299d (patch)
tree0044c123de6edb62d3527a84a6f64504e94225d0
parent8239fa15146db1247aabda7bc2a5dfbe4b350c76 (diff)
downloadenlightenment-d18751ac7f959d95d0981afeb33ab9fcc998299d.tar.gz
enlightenment-d18751ac7f959d95d0981afeb33ab9fcc998299d.tar.xz
enlightenment-d18751ac7f959d95d0981afeb33ab9fcc998299d.zip
set fwin border info before changing path to avoid race condition where icon info may be freed
SVN revision: 76791
-rw-r--r--src/modules/fileman/e_fwin.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 7f7f4d4d1..14595915b 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -2273,9 +2273,9 @@ _e_fwin_open(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, Eina_Bool force, int *need
}
else
{
+ _e_fwin_border_set(page, page->fwin, ici);
e_fm2_path_set(page->fm_obj, ici->link, "/");
- _e_fwin_window_title_set(page);
- fwin = page->fwin;
+ return page->fwin;
}
}
else if ((ici->link) && (ici->removable))
@@ -2290,9 +2290,9 @@ _e_fwin_open(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, Eina_Bool force, int *need
}
else
{
+ _e_fwin_border_set(page, page->fwin, ici);
e_fm2_path_set(page->fm_obj, buf, "/");
- _e_fwin_window_title_set(page);
- fwin = page->fwin;
+ return page->fwin;
}
}
else if (ici->real_link)
@@ -2308,9 +2308,9 @@ _e_fwin_open(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, Eina_Bool force, int *need
}
else
{
+ _e_fwin_border_set(page, page->fwin, ici);
e_fm2_path_set(page->fm_obj, NULL, ici->real_link);
- _e_fwin_window_title_set(page);
- fwin = page->fwin;
+ return page->fwin;
}
}
else
@@ -2332,9 +2332,9 @@ _e_fwin_open(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, Eina_Bool force, int *need
}
else
{
+ _e_fwin_border_set(page, page->fwin, ici);
e_fm2_path_set(page->fm_obj, NULL, ici->link ?: buf);
- _e_fwin_window_title_set(page);
- fwin = page->fwin;
+ return page->fwin;
}
}
else