summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-03-05 10:33:58 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-03-05 10:33:58 +0900
commitaa0324af36973be273a469f7bfae152f8774c57f (patch)
tree68e9f64921775681677e04e7e1315f8e28ee7af8
parent07a6d138a998ad110847b94e5c25b092cd42a717 (diff)
edje - somehow edje doesn't init evas and this makes edje_decc break...
@fix how on earth has everything worked to date? someone must have remved some evas_init from somewhere int he init codepath. this adds it back in and edje_decc works again without a segv.
-rw-r--r--src/lib/edje/edje_main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/edje/edje_main.c b/src/lib/edje/edje_main.c
index 981328720e..2540c9f494 100644
--- a/src/lib/edje/edje_main.c
+++ b/src/lib/edje/edje_main.c
@@ -61,6 +61,12 @@ edje_init(void)
61 goto shutdown_embryo; 61 goto shutdown_embryo;
62 } 62 }
63 63
64 if (!evas_init())
65 {
66 ERR("Eet init failed");
67 goto shutdown_embryo;
68 }
69
64 _edje_scale = FROM_DOUBLE(1.0); 70 _edje_scale = FROM_DOUBLE(1.0);
65 71
66 _edje_edd_init(); 72 _edje_edd_init();
@@ -164,6 +170,7 @@ _edje_shutdown_core(void)
164 ecore_imf_shutdown(); 170 ecore_imf_shutdown();
165#endif 171#endif
166 172
173 evas_shutdown();
167 eet_shutdown(); 174 eet_shutdown();
168 embryo_shutdown(); 175 embryo_shutdown();
169 ecore_shutdown(); 176 ecore_shutdown();