Fix HunspellChecker when the path is specified with a trailing '/'. (and revert previ...

see: http://thread.gmane.org/gmane.editors.lyx.devel/123324

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32357 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/HunspellChecker.cpp b/src/HunspellChecker.cpp
index 9e9ea15990f795074cf8777b8f950e4c88397115..30d799a7f2243ad9d6a26b5cd01f358202d87d6d 100644 (file)
--- a/src/HunspellChecker.cpp
+++ b/src/HunspellChecker.cpp
@@ -19,6 +19,7 @@
 
 #include "support/debug.h"
 #include "support/docstring_list.h"
+#include "support/filetools.h"
 #include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
@@ -89,8 +90,8 @@ bool haveLanguageFiles(string const & hpath)
 
 Hunspell * HunspellChecker::Private::addSpeller(string const & lang)
 {
-       string hunspell_path = external_path(lyxrc.hunspelldir_path);
-       LYXERR(Debug::FILES, "hunspell path: " << hunspell_path);
+       string hunspell_path = lyxrc.hunspelldir_path;
+       LYXERR(Debug::FILES, "hunspell path: " << external_path(hunspell_path));
        if (hunspell_path.empty()) {
                // FIXME We'd like to issue a better error message here, but there seems
                // to be a problem about thread safety, or something of the sort. If
@@ -107,7 +108,7 @@ Hunspell * HunspellChecker::Private::addSpeller(string const & lang)
                return 0;
        }
 
-       addName(hunspell_path, lang);
+       hunspell_path = external_path(addName(hunspell_path, lang));
        if (!haveLanguageFiles(hunspell_path)) {
                // try with '_' replaced by '-'
                hunspell_path = subst(hunspell_path, '_', '-');