summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/lib/emotion_smart.c
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2008-10-08 15:38:42 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2008-10-08 15:38:42 +0000
commit0ebceb16a14eb31d7ddec19cde078e9ccf1d087c (patch)
tree11eea688dccca2734609bece0ee24e49225b5f7e /legacy/emotion/src/lib/emotion_smart.c
parent5f3c76b84abd520eb4d75b0583e605eccecea1ab (diff)
emotion: do not try to do file_set when no plugin is loaded.
SVN revision: 36530
Diffstat (limited to '')
-rw-r--r--legacy/emotion/src/lib/emotion_smart.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index f932962e17..62d99e2d59 100644
--- a/legacy/emotion/src/lib/emotion_smart.c
+++ b/legacy/emotion/src/lib/emotion_smart.c
@@ -230,6 +230,8 @@ emotion_object_file_set(Evas_Object *obj, const char *file)
230 230
231 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); 231 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
232 232
233 if (!sd->module) return;
234
233 if ((file) && (sd->file) && (!strcmp(file, sd->file))) return; 235 if ((file) && (sd->file) && (!strcmp(file, sd->file))) return;
234 if ((file) && (file[0] != 0)) 236 if ((file) && (file[0] != 0))
235 { 237 {
@@ -237,11 +239,8 @@ emotion_object_file_set(Evas_Object *obj, const char *file)
237 239
238 if (sd->file) free(sd->file); 240 if (sd->file) free(sd->file);
239 sd->file = strdup(file); 241 sd->file = strdup(file);
240 if (sd->module) 242 sd->module->file_close(sd->video);
241 { 243 evas_object_image_size_set(sd->obj, 0, 0);
242 sd->module->file_close(sd->video);
243 evas_object_image_size_set(sd->obj, 0, 0);
244 }
245 if (!sd->module->file_open(sd->file, obj, sd->video)) 244 if (!sd->module->file_open(sd->file, obj, sd->video))
246 return; 245 return;
247 sd->module->size_get(sd->video, &w, &h); 246 sd->module->size_get(sd->video, &w, &h);