From 28a0402253a5c70f8b772785e92f85da47153ff7 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 5 Sep 2017 17:38:31 +0300 Subject: [PATCH] Fix command line parsing. --- Telegram/SourceFiles/settings.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp index 1239d6d9df..4306551bdd 100644 --- a/Telegram/SourceFiles/settings.cpp +++ b/Telegram/SourceFiles/settings.cpp @@ -131,7 +131,7 @@ void ParseCommandLineArguments(const QStringList &arguments) { { "-many" , KeyFormat::NoValues }, { "-key" , KeyFormat::OneValue }, { "-autostart" , KeyFormat::NoValues }, - { "-fixprevios" , KeyFormat::NoValues }, + { "-fixprevious", KeyFormat::NoValues }, { "-cleanup" , KeyFormat::NoValues }, { "-noupdate" , KeyFormat::NoValues }, { "-tosettings" , KeyFormat::NoValues }, @@ -166,7 +166,7 @@ void ParseCommandLineArguments(const QStringList &arguments) { gTestMode = parseResult.contains("-testmode"); gDebug = parseResult.contains("-debug"); gManyInstance = parseResult.contains("-many"); - gKeyFile = parseResult.value("-key", QStringList(QString())).front(); + gKeyFile = parseResult.value("-key", QStringList()).join(QString()); gLaunchMode = parseResult.contains("-autostart") ? LaunchModeAutoStart : parseResult.contains("-fixprevious") ? LaunchModeFixPrevious : parseResult.contains("-cleanup") ? LaunchModeCleanup : LaunchModeNormal; @@ -174,11 +174,11 @@ void ParseCommandLineArguments(const QStringList &arguments) { gStartToSettings = parseResult.contains("-tosettings"); gStartInTray = parseResult.contains("-startintray"); gSendPaths = parseResult.value("-sendpath", QStringList()); - gWorkingDir = parseResult.value("-workdir", QStringList(QString())).front(); + gWorkingDir = parseResult.value("-workdir", QStringList()).join(QString()); if (!gWorkingDir.isEmpty() && !QDir().exists(gWorkingDir)) { gWorkingDir = QString(); } - gStartUrl = parseResult.value("--", QStringList(QString())).front(); + gStartUrl = parseResult.value("--", QStringList()).join(QString()); } void InitFromCommandLine(int argc, char *argv[]) {