mirror of
https://github.com/vale981/tdesktop
synced 2025-03-06 02:01:40 -05:00
Merge branch 'master' of https://github.com/telegramdesktop/tdesktop
This commit is contained in:
commit
a53e0e8806
1 changed files with 8 additions and 2 deletions
|
@ -120,9 +120,15 @@ void logsInit() {
|
||||||
if (mainLogStream) return;
|
if (mainLogStream) return;
|
||||||
|
|
||||||
QString wasDir = cWorkingDir();
|
QString wasDir = cWorkingDir();
|
||||||
#if (defined Q_OS_MAC || defined Q_OS_LINUX) && !defined _DEBUG
|
#if (defined Q_OS_MAC || defined Q_OS_LINUX)
|
||||||
|
|
||||||
|
#ifdef _DEBUG
|
||||||
|
cForceWorkingDir(cExeDir());
|
||||||
|
#else
|
||||||
cForceWorkingDir(psAppDataPath());
|
cForceWorkingDir(psAppDataPath());
|
||||||
#ifdef Q_OS_LINUX // fix first version
|
#endif
|
||||||
|
|
||||||
|
#if (defined Q_OS_LINUX && !defined _DEBUG) // fix first version
|
||||||
{
|
{
|
||||||
QFile data(wasDir + "data"), dataConfig(wasDir + "data_config"), tdataConfig(wasDir + "tdata/config");
|
QFile data(wasDir + "data"), dataConfig(wasDir + "data_config"), tdataConfig(wasDir + "tdata/config");
|
||||||
if (data.exists() && dataConfig.exists() && !QFileInfo(cWorkingDir() + "data").exists() && !QFileInfo(cWorkingDir() + "data_config").exists()) { // move to home dir
|
if (data.exists() && dataConfig.exists() && !QFileInfo(cWorkingDir() + "data").exists() && !QFileInfo(cWorkingDir() + "data_config").exists()) { // move to home dir
|
||||||
|
|
Loading…
Add table
Reference in a new issue