From ff84962148ed17b16cf7a406d450bd999e95eb85 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 6 Dec 2017 19:07:01 +0400
Subject: [PATCH] Stop using current working directory on Windows.

Links generated by system sometimes have weird working directories,
like C:\Windows\system32. Stop trying to use current working folder
as a place for program data. Instead always try to use current exe
folder and if we were unable use app data folder.
---
 Telegram/SourceFiles/logs.cpp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp
index cf7084ea93..7b17cbe1bb 100644
--- a/Telegram/SourceFiles/logs.cpp
+++ b/Telegram/SourceFiles/logs.cpp
@@ -307,20 +307,21 @@ namespace Logs {
 		if (!Sandbox::CheckBetaVersionDir()) {
 			return;
 		}
-		bool workingDirChosen = cBetaVersion();
 
-		QString initialWorkingDir = QDir(cWorkingDir()).absolutePath() + '/', moveOldDataFrom;
+		auto initialWorkingDir = QDir(cWorkingDir()).absolutePath() + '/';
+		auto moveOldDataFrom = QString();
+		auto workingDirChosen = false;
+
 		if (cBetaVersion()) {
 			cSetDebug(true);
+			workingDirChosen = true;
 #if defined Q_OS_MAC || defined Q_OS_LINUX
 		} else {
 #ifdef _DEBUG
 			cForceWorkingDir(cExeDir());
 #else // _DEBUG
-			if (cWorkingDir().isEmpty()) {
-				cForceWorkingDir(psAppDataPath());
-			}
-#endif // else for _DEBUG
+			cForceWorkingDir(psAppDataPath());
+#endif // !_DEBUG
 			workingDirChosen = true;
 
 #if defined Q_OS_LINUX && !defined _DEBUG // fix first version
@@ -331,31 +332,31 @@ namespace Logs {
 		} else {
 			cForceWorkingDir(psAppDataPath());
 			workingDirChosen = true;
-#elif defined OS_WIN_STORE
+#elif defined OS_WIN_STORE // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT
 #ifdef _DEBUG
 			cForceWorkingDir(cExeDir());
 #else // _DEBUG
 			cForceWorkingDir(psAppDataPath());
-#endif // else for _DEBUG
-#endif // OS_WIN_STORE
+#endif // !_DEBUG
+			workingDirChosen = true;
+#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || OS_WIN_STORE
 		}
 
 		LogsData = new LogsDataFields();
 		if (!workingDirChosen) {
-			cForceWorkingDir(cWorkingDir());
+			cForceWorkingDir(cExeDir());
 			if (!LogsData->openMain()) {
-				cForceWorkingDir(cExeDir());
-				if (!LogsData->openMain()) {
-					cForceWorkingDir(psAppDataPath());
-				}
+				cForceWorkingDir(psAppDataPath());
 			}
 		}
 
 		cForceWorkingDir(QDir(cWorkingDir()).absolutePath() + '/');
+
 // WinRT build requires the working dir to stay the same for plugin loading.
 #ifndef Q_OS_WINRT
 		QDir().setCurrent(cWorkingDir());
 #endif // !Q_OS_WINRT
+
 		QDir().mkpath(cWorkingDir() + qstr("tdata"));
 
 		Sandbox::WorkingDirReady();