From 62fb670089d25d3fe482523795a3fcc50ee05251 Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Wed, 2 Oct 2019 02:56:24 +0300 Subject: [PATCH] Fixed restart settings --- Telegram/SourceFiles/platform/linux/launcher_linux.cpp | 6 +++--- Telegram/SourceFiles/platform/mac/launcher_mac.mm | 6 +++--- Telegram/SourceFiles/platform/win/launcher_win.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp index 02b5488e6..622f9dce0 100644 --- a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp @@ -75,18 +75,18 @@ bool Launcher::launchUpdater(UpdaterLaunch action) { argumentsList.push("-externalupdater"); } #endif // !TDESKTOP_DISABLE_AUTOUPDATE - if (cMainFont()) { + if (!cMainFont().isEmpty()) { argumentsList.push(qsl("-mainfont")); pushArgument(QFile::encodeName(cMainFont())); } - if (cSemiboldFont()) { + if (!cSemiboldFont().isEmpty()) { argumentsList.push(qsl("-semiboldfont")); pushArgument(QFile::encodeName(cSemiboldFont())); } if (cSemiboldFontIsBold()) { argumentsList.push(qsl("-semiboldisbold")); } - if (cMonospaceFont()) { + if (!cMonospaceFont().isEmpty()) { argumentsList.push(qsl("-monospacefont")); pushArgument(QFile::encodeName(cMonospaceFont())); } diff --git a/Telegram/SourceFiles/platform/mac/launcher_mac.mm b/Telegram/SourceFiles/platform/mac/launcher_mac.mm index fbc225eea..c80505525 100644 --- a/Telegram/SourceFiles/platform/mac/launcher_mac.mm +++ b/Telegram/SourceFiles/platform/mac/launcher_mac.mm @@ -67,18 +67,18 @@ bool Launcher::launchUpdater(UpdaterLaunch action) { #ifndef TDESKTOP_DISABLE_AUTOUPDATE if (Core::UpdaterDisabled()) [args addObject:@"-externalupdater"]; #endif // !TDESKTOP_DISABLE_AUTOUPDATE - if (cMainFont()) { + if (!cMainFont().isEmpty()) { [args addObject:@"-mainfont"]; [args addObject:Q2NSString(cMainFont())]; } - if (cSemiboldFont()) { + if (!cSemiboldFont().isEmpty()) { [args addObject:@"-semiboldfont"]; [args addObject:Q2NSString(cSemiboldFont())]; } if (cSemiboldFontIsBold()) { argumentsList.push(qsl("-semiboldisbold")); } - if (cMonospaceFont()) { + if (!cMonospaceFont().isEmpty()) { [args addObject:@"-monospacefont"]; [args addObject:Q2NSString(cMonospaceFont())]; } diff --git a/Telegram/SourceFiles/platform/win/launcher_win.cpp b/Telegram/SourceFiles/platform/win/launcher_win.cpp index e1c953d83..727b17059 100644 --- a/Telegram/SourceFiles/platform/win/launcher_win.cpp +++ b/Telegram/SourceFiles/platform/win/launcher_win.cpp @@ -80,18 +80,18 @@ bool Launcher::launchUpdater(UpdaterLaunch action) { pushArgument(qsl("-workdir")); pushArgument('"' + cWorkingDir() + '"'); } - if (cMainFont()) { + if (!cMainFont().isEmpty()) { pushArgument(qsl("-mainfont")); pushArgument('"' + cMainFont() + '"'); } - if (cSemiboldFont()) { + if (!cSemiboldFont().isEmpty()) { pushArgument(qsl("-semiboldfont")); pushArgument('"' + cSemiboldFont() + '"'); } if (cSemiboldFontIsBold()) { pushArgument(qsl("-semiboldisbold")); } - if (cMonospaceFont()) { + if (!cMonospaceFont().isEmpty()) { pushArgument(qsl("-monospacefont")); pushArgument('"' + cMonospaceFont() + '"'); }