summaryrefslogtreecommitdiff
path: root/src/tests/emotion
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-08-22 17:37:50 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-08-22 17:38:50 +0900
commitc20cf0964f3c3fd403d547e4898fa3fd2ee6bf59 (patch)
treec8a54131e29b78e31770a9bb257ce272b6085868 /src/tests/emotion
parentef91422e90313f546fcdf3c491f8beba1d854aef (diff)
emotion - make emotion object init now optional.
if you don't init (or set engine) on an emotion object, itstill works - it chooses the default engine.. whihc i now have set as gst1. :) one less thing that HAS to be done on init. better.
Diffstat (limited to 'src/tests/emotion')
-rw-r--r--src/tests/emotion/emotion_test_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tests/emotion/emotion_test_main.c b/src/tests/emotion/emotion_test_main.c
index e435935332..67906840c1 100644
--- a/src/tests/emotion/emotion_test_main.c
+++ b/src/tests/emotion/emotion_test_main.c
@@ -579,7 +579,7 @@ init_video_object(const char *module_filename, const char *filename)
579 579
580 /* basic video object setup */ 580 /* basic video object setup */
581 o = emotion_object_add(evas); 581 o = emotion_object_add(evas);
582 if (!emotion_object_init(o, module_filename)) 582 if ((module_filename) && (!emotion_object_init(o, module_filename)))
583 return; 583 return;
584 emotion_object_vis_set(o, vis); 584 emotion_object_vis_set(o, vis);
585 if (!emotion_object_file_set(o, filename)) 585 if (!emotion_object_file_set(o, filename))