From a032f24d58ef5cf991edd2378206f06af0bc3a70 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 7 Dec 2017 17:56:36 +0400
Subject: [PATCH] Fix explicit working dir by "-workdir" argument.

Regression was introduced in ff84962148.

Fixes #4123.
---
 Telegram/SourceFiles/logs.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp
index 7b17cbe1b..7dc19365e 100644
--- a/Telegram/SourceFiles/logs.cpp
+++ b/Telegram/SourceFiles/logs.cpp
@@ -320,7 +320,12 @@ namespace Logs {
 #ifdef _DEBUG
 			cForceWorkingDir(cExeDir());
 #else // _DEBUG
-			cForceWorkingDir(psAppDataPath());
+			if (!cWorkingDir().isEmpty()) {
+				// This value must come only from the "-workdir" argument.
+				cForceWorkingDir(cWorkingDir());
+			} else {
+				cForceWorkingDir(psAppDataPath());
+			}
 #endif // !_DEBUG
 			workingDirChosen = true;