diff --git a/Telegram/SourceFiles/_other/updater_linux.cpp b/Telegram/SourceFiles/_other/updater_linux.cpp index 660fdc7cca..233b102f86 100644 --- a/Telegram/SourceFiles/_other/updater_linux.cpp +++ b/Telegram/SourceFiles/_other/updater_linux.cpp @@ -384,7 +384,6 @@ int main(int argc, char *argv[]) { bool writeprotected = false; bool tosettings = false; bool startintray = false; - bool externalupdater = false; bool customWorkingDir = false; char *key = 0; @@ -398,8 +397,6 @@ int main(int argc, char *argv[]) { debug = _debug = true; } else if (equal(argv[i], "-startintray")) { startintray = true; - } else if (equal(argv[i], "-externalupdater")) { - externalupdater = true; } else if (equal(argv[i], "-tosettings")) { tosettings = true; } else if (equal(argv[i], "-workdir_custom")) { @@ -500,7 +497,6 @@ int main(int argc, char *argv[]) { if (autostart) push("-autostart"); if (debug) push("-debug"); if (startintray) push("-startintray"); - if (externalupdater) push("-externalupdater"); if (tosettings) push("-tosettings"); if (key) { push("-key"); diff --git a/Telegram/SourceFiles/_other/updater_osx.m b/Telegram/SourceFiles/_other/updater_osx.m index 72358ce81f..5f28125c51 100644 --- a/Telegram/SourceFiles/_other/updater_osx.m +++ b/Telegram/SourceFiles/_other/updater_osx.m @@ -90,7 +90,7 @@ int main(int argc, const char * argv[]) { openLog(); pid_t procId = 0; - BOOL update = YES, toSettings = NO, autoStart = NO, startInTray = NO, freeType = NO, externalUpdater = NO; + BOOL update = YES, toSettings = NO, autoStart = NO, startInTray = NO, freeType = NO; BOOL customWorkingDir = NO; NSString *key = nil; for (int i = 0; i < argc; ++i) { @@ -116,8 +116,6 @@ int main(int argc, const char * argv[]) { startInTray = YES; } else if ([@"-freetype" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) { freeType = YES; - } else if ([@"-externalupdater" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) { - externalUpdater = YES; } else if ([@"-workdir_custom" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) { customWorkingDir = YES; } else if ([@"-key" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) { @@ -255,7 +253,6 @@ int main(int argc, const char * argv[]) { if (_debug) [args addObject:@"-debug"]; if (startInTray) [args addObject:@"-startintray"]; if (freeType) [args addObject:@"-freetype"]; - if (externalUpdater) [args addObject:@"-externalupdater"]; if (autoStart) [args addObject:@"-autostart"]; if (key) { [args addObject:@"-key"]; diff --git a/Telegram/SourceFiles/_other/updater_win.cpp b/Telegram/SourceFiles/_other/updater_win.cpp index bbb495a5fc..d380fc4c67 100644 --- a/Telegram/SourceFiles/_other/updater_win.cpp +++ b/Telegram/SourceFiles/_other/updater_win.cpp @@ -343,7 +343,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPWSTR cmdPara LPWSTR *args; int argsCount; - bool needupdate = false, autostart = false, debug = false, writeprotected = false, startintray = false, freetype = false, externalupdater = false; + bool needupdate = false, autostart = false, debug = false, writeprotected = false, startintray = false, freetype = false; args = CommandLineToArgvW(GetCommandLine(), &argsCount); if (args) { for (int i = 1; i < argsCount; ++i) { @@ -359,8 +359,6 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPWSTR cmdPara startintray = true; } else if (equal(args[i], L"-freetype")) { freetype = true; - } else if (equal(args[i], L"-externalupdater")) { - externalupdater = true; } else if (equal(args[i], L"-writeprotected") && ++i < argsCount) { writeLog(std::wstring(L"Argument: ") + args[i]); writeprotected = true; @@ -431,7 +429,6 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPWSTR cmdPara if (debug) targs += L" -debug"; if (startintray) targs += L" -startintray"; if (freetype) targs += L" -freetype"; - if (externalupdater) targs += L" -externalupdater"; if (!customWorkingDir.empty()) { targs += L" -workdir \"" + customWorkingDir + L"\""; } diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp index 32b9c691d8..60dd4f1305 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp @@ -454,7 +454,6 @@ void Launcher::processArguments() { { "-fixprevious" , KeyFormat::NoValues }, { "-cleanup" , KeyFormat::NoValues }, { "-noupdate" , KeyFormat::NoValues }, - { "-externalupdater", KeyFormat::NoValues }, { "-tosettings" , KeyFormat::NoValues }, { "-startintray" , KeyFormat::NoValues }, { "-sendpath" , KeyFormat::AllLeftValues }, @@ -485,9 +484,6 @@ void Launcher::processArguments() { } } - if (parseResult.contains("-externalupdater")) { - SetUpdaterDisabledAtStartup(); - } gUseFreeType = parseResult.contains("-freetype"); gDebugMode = parseResult.contains("-debug"); gManyInstance = parseResult.contains("-many"); diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp index 47316905d2..f7cbc261d4 100644 --- a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp @@ -124,11 +124,6 @@ bool Launcher::launchUpdater(UpdaterLaunch action) { if (cStartInTray()) { argumentsList.push("-startintray"); } -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - if (Core::UpdaterDisabled()) { - argumentsList.push("-externalupdater"); - } -#endif // !TDESKTOP_DISABLE_AUTOUPDATE if (cDataFile() != qsl("data")) { argumentsList.push("-key"); argumentsList.push(QFile::encodeName(cDataFile())); diff --git a/Telegram/SourceFiles/platform/mac/launcher_mac.mm b/Telegram/SourceFiles/platform/mac/launcher_mac.mm index d41c957a28..2f298ec4d6 100644 --- a/Telegram/SourceFiles/platform/mac/launcher_mac.mm +++ b/Telegram/SourceFiles/platform/mac/launcher_mac.mm @@ -61,9 +61,6 @@ bool Launcher::launchUpdater(UpdaterLaunch action) { if (Logs::DebugEnabled()) [args addObject:@"-debug"]; if (cStartInTray()) [args addObject:@"-startintray"]; if (cUseFreeType()) [args addObject:@"-freetype"]; -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - if (Core::UpdaterDisabled()) [args addObject:@"-externalupdater"]; -#endif // !TDESKTOP_DISABLE_AUTOUPDATE if (cDataFile() != qsl("data")) { [args addObject:@"-key"]; [args addObject:Q2NSString(cDataFile())]; diff --git a/Telegram/SourceFiles/platform/win/launcher_win.cpp b/Telegram/SourceFiles/platform/win/launcher_win.cpp index a53de34a86..ea9f1b2378 100644 --- a/Telegram/SourceFiles/platform/win/launcher_win.cpp +++ b/Telegram/SourceFiles/platform/win/launcher_win.cpp @@ -70,11 +70,6 @@ bool Launcher::launchUpdater(UpdaterLaunch action) { if (cUseFreeType()) { pushArgument(qsl("-freetype")); } -#ifndef TDESKTOP_DISABLE_AUTOUPDATE - if (Core::UpdaterDisabled()) { - pushArgument(qsl("-externalupdater")); - } -#endif // !TDESKTOP_DISABLE_AUTOUPDATE if (customWorkingDir()) { pushArgument(qsl("-workdir")); pushArgument('"' + cWorkingDir() + '"');