discomfitor pushed a commit to branch efl-1.9.
http://git.enlightenment.org/core/efl.git/commit/?id=1f363c488e1f234593aaf3b01a16357616a84fa8
commit 1f363c488e1f234593aaf3b01a16357616a84fa8
Author: Wonguk Jeong <wonguk.je...@samsung.com>
Date: Sun Apr 20 09:58:47 2014 -0400
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
---
src/lib/emotion/emotion_modules.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/lib/emotion/emotion_modules.c
b/src/lib/emotion/emotion_modules.c
index afbf941..006b555 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
m = _find_mod(name);
if (m) eina_module_load(m);
}
- else
+
+ if (!_emotion_engine_registry)
{
- if (!_emotion_engine_registry)
- {
- m = _find_mod("generic");
- if (!m) m = _find_mod("xine");
- if (!m) m = _find_mod("gstreamer");
- if (!m) m = _find_mod("gstreamer1");
- if (m) eina_module_load(m);
- }
+ m = _find_mod("generic");
+ if (!m) m = _find_mod("xine");
+ if (!m) m = _find_mod("gstreamer");
+ if (!m) m = _find_mod("gstreamer1");
+ if (m) eina_module_load(m);
}
if (name)
--
