summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-11-24 12:35:47 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-11-24 12:35:47 +0900
commita96f443c1022c568cf0db9fec10a6b4d78a61678 (patch)
treefe085d44395f99efb1a37ada6dd71ddbdc0d7039
parent8c9404a414b783e6c498e1fb07bcff9825f73233 (diff)
gadman - fix possible segv with conf being null
-rw-r--r--src/bin/e_widget_filepreview.c6
-rw-r--r--src/modules/gadman/e_mod_gadman.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/src/bin/e_widget_filepreview.c b/src/bin/e_widget_filepreview.c
index 2b7d45daa..b10ed0c5b 100644
--- a/src/bin/e_widget_filepreview.c
+++ b/src/bin/e_widget_filepreview.c
@@ -271,7 +271,11 @@ _e_wid_fprev_preview_video_change(void *data, Evas_Object *obj)
271 pos = (pos * tot) / 100.0; 271 pos = (pos * tot) / 100.0;
272 t = pos - t; 272 t = pos - t;
273 if (t < 0.0) t = -t; 273 if (t < 0.0) t = -t;
274 if (t > 0.25) emotion_object_position_set(data, pos); 274 if (t > 0.25)
275 {
276 fprintf(stderr, "SET %3.3f\n", pos);
277 emotion_object_position_set(data, pos);
278 }
275} 279}
276 280
277static void 281static void
diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c
index eb5425738..54694297a 100644
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -611,13 +611,14 @@ gadman_update_bg(void)
611 const char *ext; 611 const char *ext;
612 612
613 if (!Man->gadcons[GADMAN_LAYER_TOP]) return; 613 if (!Man->gadcons[GADMAN_LAYER_TOP]) return;
614 if (!Man->conf) return;
614 obj = edje_object_part_swallow_get(Man->full_bg, "e.swallow.bg"); 615 obj = edje_object_part_swallow_get(Man->full_bg, "e.swallow.bg");
615 if (obj) 616 if (obj)
616 { 617 {
617 edje_object_part_unswallow(Man->full_bg, obj); 618 edje_object_part_unswallow(Man->full_bg, obj);
618 evas_object_del(obj); 619 evas_object_del(obj);
619 } 620 }
620 621
621 switch (Man->conf->bg_type) 622 switch (Man->conf->bg_type)
622 { 623 {
623 case BG_STD: 624 case BG_STD: