Merge branch 'master' into osxff29

12 years ago · fa16bdc7b3
parent 5c13508401 1950b29fc8
commit fa16bdc7b3
1 changed files with 2 additions and 2 deletions
--- a/src/launcher/kiwix-launcher.cpp
+++ b/src/launcher/kiwix-launcher.cpp
@ -47,7 +47,7 @@ int main(int argc, char *argv[]) {
    /* Find xulrunner binary path */
    string xulrunnerPath = computeAbsolutePath(xulrunnerDirectory, "xulrunner-bin");
    if (!fileExists(xulrunnerPath)) {
-      xulrunnerPath = computeAbsolutePath(executableDirectory, "xulrunner");
+      xulrunnerPath = computeAbsolutePath(xulrunnerDirectory, "xulrunner");
      if (!fileExists(xulrunnerPath)) {
 	perror("Unable to find neither the 'xulrunner-bin' nor the 'xulrunner' binary");
 	return EXIT_FAILURE;