summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWonguk Jeong <wonguk.jeong@samsung.com>2014-04-20 09:58:47 -0400
committerMike Blumenkrantz <zmike@samsung.com>2014-04-20 10:00:20 -0400
commit1f363c488e1f234593aaf3b01a16357616a84fa8 (patch)
treef2cd3dc720a6d6794a007eb146226695634861fd
parent753817b28346fb398d62e8b6ee19cfff2ce35aa7 (diff)
emotion: fix triggering condition of fallback module loading
@fix Summary: In emotion_engine_instance_new(), if given module name is wrong or if loding is failed, fallback module loading should be triggered.a (previously, it check just whether name is NULL or not) In case of T1025, "vlc" was given name. Therefore, fallback was not triggered. Fixes T1025 Test Plan: enlightenment -> efm -> mouse over multimedia files -> check whether preview is shown properly or not Reviewers: raster, cedric CC: seoz, cedric, zmike Maniphest Tasks: T1025 Differential Revision: https://phab.enlightenment.org/D773
-rw-r--r--src/lib/emotion/emotion_modules.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/lib/emotion/emotion_modules.c b/src/lib/emotion/emotion_modules.c
index afbf9416ea..006b5551ae 100644
--- a/src/lib/emotion/emotion_modules.c
+++ b/src/lib/emotion/emotion_modules.c
@@ -356,16 +356,14 @@ emotion_engine_instance_new(const char *name, Evas_Object *obj, Emotion_Module_O
356 m = _find_mod(name); 356 m = _find_mod(name);
357 if (m) eina_module_load(m); 357 if (m) eina_module_load(m);
358 } 358 }
359 else 359
360 if (!_emotion_engine_registry)
360 { 361 {
361 if (!_emotion_engine_registry) 362 m = _find_mod("generic");
362 { 363 if (!m) m = _find_mod("xine");
363 m = _find_mod("generic"); 364 if (!m) m = _find_mod("gstreamer");
364 if (!m) m = _find_mod("xine"); 365 if (!m) m = _find_mod("gstreamer1");
365 if (!m) m = _find_mod("gstreamer"); 366 if (m) eina_module_load(m);
366 if (!m) m = _find_mod("gstreamer1");
367 if (m) eina_module_load(m);
368 }
369 } 367 }
370 368
371 if (name) 369 if (name)