diff options
| author | George Hazan <ghazan@miranda.im> | 2019-06-03 12:28:00 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-06-03 12:28:00 +0300 |
| commit | 240b4b12c1ec026be8a62b7ecd1f4702736b0e1b (patch) | |
| tree | 1cea16e803c8f17891fc2ce5799f975e3a182e98 /plugins/SmileyAdd/src/smileys.cpp | |
| parent | 3d3e230abad4846ecfbe9aecb14cfcfd94a4d854 (diff) | |
fixes #1971 completely (SmileyAdd: regressions)
Diffstat (limited to 'plugins/SmileyAdd/src/smileys.cpp')
| -rw-r--r-- | plugins/SmileyAdd/src/smileys.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp index 904635102c..100d695ddb 100644 --- a/plugins/SmileyAdd/src/smileys.cpp +++ b/plugins/SmileyAdd/src/smileys.cpp @@ -350,9 +350,9 @@ bool SmileyPackType::LoadSmileyFile(const CMStringW &filename, const CMStringW & return false; } + wchar_t wszTmp[MAX_PATH]; CMStringW modpath = VARSW(filename); if (_waccess(modpath, 4) != 0) { - wchar_t wszTmp[MAX_PATH]; PathToAbsoluteW(filename, wszTmp, g_plugin.wszDefaultPath[0] ? g_plugin.wszDefaultPath : nullptr); if (_waccess(wszTmp, 4) != 0) { if (!noerr) { @@ -365,9 +365,10 @@ bool SmileyPackType::LoadSmileyFile(const CMStringW &filename, const CMStringW & m_Name = L"Nothing loaded"; return false; } - modpath = wszTmp; } + else PathToAbsoluteW(modpath, wszTmp, g_plugin.wszDefaultPath[0] ? g_plugin.wszDefaultPath : nullptr); + modpath = wszTmp; m_Filename = filename; // Load file |