Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/lib
Modified Files:
emotion_smart.c
Log Message:
less segv's
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- emotion_smart.c 4 Nov 2005 08:21:28 -0000 1.19
+++ emotion_smart.c 23 Jan 2006 03:00:35 -0000 1.20
@@ -131,7 +131,7 @@
handle = mod->handle;
module_close = dlsym(handle, "module_close");
- if (module_close) module_close(mod, video);
+ if ((module_close) && (video)) module_close(mod, video);
dlclose(handle);
}
@@ -190,6 +190,7 @@
if ((file) && (file[0] != 0))
{
int w, h;
+
sd->file = strdup(file);
if (sd->module)
{
@@ -210,6 +211,7 @@
{
sd->module->file_close(sd->video);
sd->video = NULL;
+ printf("VIDEO -> NULL\n");
evas_object_image_size_set(sd->obj, 0, 0);
}
}
@@ -1023,7 +1025,7 @@
rows,
&rows[ps.h],
&rows[ps.h + (ps.h / 2)]))
- evas_object_image_pixels_import(obj, &ps);
+ evas_object_image_pixels_import(obj, &ps);
evas_object_image_pixels_dirty_set(obj, 0);
free(ps.rows);
}
@@ -1088,8 +1090,9 @@
Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ printf("DEL: sd->video = %p\n", sd->video);
if (sd->video) sd->module->file_close(sd->video);
- if (sd->module) _emotion_module_close(sd->module, sd->video);
+ _emotion_module_close(sd->module, sd->video);
evas_object_del(sd->obj);
if (sd->file) free(sd->file);
if (sd->job) ecore_job_del(sd->job);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
