[Bug 19345] revbrowser: Add workaround for loading CEF from Externals dir

peter-b · peter-b · commit 73b016503db3 · 2017-03-08T12:05:45.000Z
Add the same workaround to `revbrowser` that was added for `libbrowser` in commit 0e42caf. See also bug 19381.
diff --git a/revbrowser/src/cefbrowser.cpp b/revbrowser/src/cefbrowser.cpp
@@ -143,9 +143,20 @@ static bool __MCCefGetLibraryPath(char*& r_path)
     int t_retval = EXTERNAL_SUCCESS;
 
     void *t_module = nullptr;
-    LoadModuleByName("./CEF/libcef", &t_module, &t_retval);
-    if (t_retval != EXTERNAL_SUCCESS)
-        t_module = nullptr;
+    if (t_module == nullptr)
+    {
+        LoadModuleByName("./CEF/libcef", &t_module, &t_retval);
+        if (t_retval != EXTERNAL_SUCCESS)
+            t_module = nullptr;
+    }
+#if defined(WIN32) || defined(TARGET_PLATFORM_LINUX)
+    if (t_module == nullptr)
+    {
+        LoadModuleByName("./Externals/CEF/libcef", &t_module, &t_retval);
+        if (t_retval != EXTERNAL_SUCCESS)
+            t_module = nullptr;
+    }
+#endif
 
     char *t_module_path =
         t_module != nullptr ? CopyNativePathOfModule(t_module, &t_retval)
