summaryrefslogtreecommitdiff
path: root/src/modules/chat/tools.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-01-18 13:15:17 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-01-18 13:15:17 +0000
commit58c50b96dd38bf0427fa973cc27991e485550651 (patch)
treed42c3bbc91df1b60e695c49a446e41491406d58f /src/modules/chat/tools.cpp
parent08ed3a95b4f42079eea4d930af81257564b85b97 (diff)
- returned back the old default settings for Chats/LogDirectory;
- %userid% is being added to a log path, if it doesn't end with \ git-svn-id: http://svn.miranda-ng.org/main/trunk@7718 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/chat/tools.cpp')
-rw-r--r--src/modules/chat/tools.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/modules/chat/tools.cpp b/src/modules/chat/tools.cpp
index c54341e8f3..384992b8f7 100644
--- a/src/modules/chat/tools.cpp
+++ b/src/modules/chat/tools.cpp
@@ -787,11 +787,18 @@ TCHAR* GetChatLogsFilename(SESSION_INFO *si, time_t tTime)
rva[10].lptzKey = NULL;
rva[10].lptzValue = NULL;
+ TCHAR tszTemp[MAX_PATH], *ptszVarPath;
+ if (g_Settings->pszLogDir[lstrlen(g_Settings->pszLogDir) - 1] == '\\') {
+ mir_sntprintf(tszTemp, SIZEOF(tszTemp), _T("%s%s"), g_Settings->pszLogDir, _T("%userid%.log"));
+ ptszVarPath = tszTemp;
+ }
+ else ptszVarPath = g_Settings->pszLogDir;
+
REPLACEVARSDATA dat = { sizeof(dat) };
dat.dwFlags = RVF_TCHAR;
dat.hContact = si->hContact;
dat.variables = rva;
- TCHAR *tszParsedName = (TCHAR*)CallService(MS_UTILS_REPLACEVARS, (WPARAM)g_Settings->pszLogDir, (LPARAM)&dat);
+ TCHAR *tszParsedName = (TCHAR*)CallService(MS_UTILS_REPLACEVARS, (WPARAM)ptszVarPath, (LPARAM)&dat);
PathToAbsoluteT(tszParsedName, si->pszLogFileName);
mir_free(tszParsedName);