diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp index 348a26213..f7479b725 100644 --- a/Telegram/SourceFiles/logs.cpp +++ b/Telegram/SourceFiles/logs.cpp @@ -341,9 +341,10 @@ void start(not_null launcher) { if (cAlphaVersion()) { workingDirChosen = true; + } else { #if defined Q_OS_MAC || defined Q_OS_LINUX - } else { + if (!cWorkingDir().isEmpty()) { // This value must come from TelegramForcePortable // or from the "-workdir" command line argument. @@ -362,11 +363,12 @@ void start(not_null launcher) { #endif // Q_OS_LINUX && !_DEBUG #elif defined Q_OS_WINRT // Q_OS_MAC || Q_OS_LINUX - } else { + cForceWorkingDir(psAppDataPath()); workingDirChosen = true; #elif defined OS_WIN_STORE // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT + #ifdef _DEBUG cForceWorkingDir(cExeDir()); #else // _DEBUG @@ -375,7 +377,7 @@ void start(not_null launcher) { workingDirChosen = true; #elif defined Q_OS_WIN - } else { + if (!cWorkingDir().isEmpty()) { // This value must come from TelegramForcePortable // or from the "-workdir" command line argument. @@ -384,6 +386,7 @@ void start(not_null launcher) { } #endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || OS_WIN_STORE + } LogsData = new LogsDataFields();