diff options
| author | Cedric BAIL <cedric@osg.samsung.com> | 2014-10-30 07:22:17 +0100 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2014-10-30 07:24:08 +0100 |
| commit | 91db0da8849b16d7889629be169b6bdd696b928f (patch) | |
| tree | ea7e1a73261ddb1b1f4d7ba7ec3b96a02f32737c | |
| parent | 422182a2d9d3995448bbb14a85716946573b3fce (diff) | |
| download | elementary-91db0da8849b16d7889629be169b6bdd696b928f.tar.gz | |
quicklaunch: initialize edje earlier.
We do trigger an edje theme open during the first stage of quicklaunch as part of
config init apparently. So we better init or we will endup with some really bad
memory corruption.
| -rw-r--r-- | src/lib/elm_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index 646969393..a708d12c9 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -620,6 +620,7 @@ elm_quicklaunch_init(int argc, eet_init(); ecore_init(); + edje_init(); #ifdef HAVE_ELEMENTARY_EMAP emap_init(); @@ -686,7 +687,6 @@ elm_quicklaunch_sub_init(int argc, { ecore_app_args_set(argc, (const char **)argv); evas_init(); - edje_init(); _elm_module_init(); _elm_config_init(); _elm_config_sub_init(); @@ -722,7 +722,6 @@ elm_quicklaunch_sub_shutdown(void) ecore_imf_shutdown(); ecore_evas_shutdown(); _elm_config_sub_shutdown(); - edje_shutdown(); evas_shutdown(); } return _elm_sub_init_count; @@ -765,6 +764,7 @@ elm_quicklaunch_shutdown(void) #endif _elm_emotion_shutdown(); + edje_shutdown(); ecore_shutdown(); eet_shutdown(); @@ -953,7 +953,6 @@ elm_quicklaunch_fork(int argc, #ifdef SEMI_BROKEN_QUICKLAUNCH ecore_app_args_set(argc, (const char **)argv); evas_init(); - edje_init(); _elm_module_init(); _elm_config_sub_init(); # ifdef HAVE_ELEMENTARY_X |