Commit 63fa06d6 by maarten

preforked server

git-svn-id: svn+ssh://gitlab/srv/svn-repos/pdb-redo/trunk@357 a1961a4f-ab94-4bcc-80e8-33b5a54de466
parent 9856d0de
...@@ -2426,13 +2426,18 @@ void File::loadDictionary(const char* dict) ...@@ -2426,13 +2426,18 @@ void File::loadDictionary(const char* dict)
{ {
string name(dict); string name(dict);
try
{
if (fs::exists(name)) if (fs::exists(name))
{ {
fs::ifstream is(name); fs::ifstream is(name);
loadDictionary(is); loadDictionary(is);
break; break;
} }
}
catch (...) {}
{
fs::path dictFile = string("dictionaries/") + dict + ".dic"; fs::path dictFile = string("dictionaries/") + dict + ".dic";
if (fs::exists(dictFile)) if (fs::exists(dictFile))
{ {
...@@ -2440,6 +2445,8 @@ void File::loadDictionary(const char* dict) ...@@ -2440,6 +2445,8 @@ void File::loadDictionary(const char* dict)
loadDictionary(is); loadDictionary(is);
break; break;
} }
}
catch (...) {}
#if defined(USE_RSRC) #if defined(USE_RSRC)
mrsrc::rsrc dictData(dictFile.string()); mrsrc::rsrc dictData(dictFile.string());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment