raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=a96f443c1022c568cf0db9fec10a6b4d78a61678
commit a96f443c1022c568cf0db9fec10a6b4d78a61678
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Sun Nov 24 12:35:47 2013 +0900
gadman - fix possible segv with conf being null
---
src/bin/e_widget_filepreview.c | 6 +++++-
src/modules/gadman/e_mod_gadman.c | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_widget_filepreview.c b/src/bin/e_widget_filepreview.c
index 2b7d45d..b10ed0c 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)
pos = (pos * tot) / 100.0;
t = pos - t;
if (t < 0.0) t = -t;
- if (t > 0.25) emotion_object_position_set(data, pos);
+ if (t > 0.25)
+ {
+ fprintf(stderr, "SET %3.3f\n", pos);
+ emotion_object_position_set(data, pos);
+ }
}
static void
diff --git a/src/modules/gadman/e_mod_gadman.c
b/src/modules/gadman/e_mod_gadman.c
index eb54257..5469429 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)
const char *ext;
if (!Man->gadcons[GADMAN_LAYER_TOP]) return;
+ if (!Man->conf) return;
obj = edje_object_part_swallow_get(Man->full_bg, "e.swallow.bg");
if (obj)
{
edje_object_part_unswallow(Man->full_bg, obj);
evas_object_del(obj);
}
-
+
switch (Man->conf->bg_type)
{
case BG_STD:
--
