From 0d33c5eb19936df7b215fb299f6aa28b331f2cc1 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Tue, 12 Jun 2012 16:29:11 +0000
Subject: [PATCH] bitch--

SVN revision: 72043
---
 legacy/edje/src/lib/edje_load.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c
index 47c724f90c..5fbfb3d689 100644
--- a/legacy/edje/src/lib/edje_load.c
+++ b/legacy/edje/src/lib/edje_load.c
@@ -1080,9 +1080,11 @@ void
 _edje_file_del(Edje *ed)
 {
    Edje_User_Defined *eud;
-   Evas *tev = evas_object_evas_get(ed->obj);
+   Evas *tev = NULL;
+   
+   if (ed->obj) tev = evas_object_evas_get(ed->obj);
 
-   evas_event_freeze(tev);
+   if (tev) evas_event_freeze(tev);
    if (ed->freeze_calc)
      {
         _edje_freeze_calc_list = eina_list_remove(_edje_freeze_calc_list, ed);
@@ -1101,8 +1103,11 @@ _edje_file_del(Edje *ed)
 
    if (!((ed->file) && (ed->collection)))
      {
-        evas_event_thaw(tev);
-        evas_event_thaw_eval(tev);
+        if (tev)
+          {
+             evas_event_thaw(tev);
+             evas_event_thaw_eval(tev);
+          }
         return;
      }
    if (ed->table_parts)
@@ -1242,8 +1247,11 @@ _edje_file_del(Edje *ed)
    ed->table_programs = NULL;
    ed->table_programs_size = 0;
    ed->focused_part = NULL;
-   evas_event_thaw(tev);
-   evas_event_thaw_eval(tev);
+   if (tev)
+     {
+        evas_event_thaw(tev);
+        evas_event_thaw_eval(tev);
+     }
 }
 
 void