From d016f4812a336d04ef843f4c629687c4413038c2 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Wed, 14 Jun 2017 11:06:09 +0200
Subject: [PATCH] feat(src/app/App): do not parse args twice

---
 linphone-desktop/src/app/App.cpp | 9 ++++-----
 linphone-desktop/src/app/App.hpp | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp
index 4be0bf53f..7fe9e96ff 100644
--- a/linphone-desktop/src/app/App.cpp
+++ b/linphone-desktop/src/app/App.cpp
@@ -73,7 +73,8 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) {
   setApplicationVersion(LINPHONE_QT_GIT_VERSION);
   setWindowIcon(QIcon(WINDOW_ICON_PATH));
 
-  parseArgs();
+  createParser();
+  mParser->process(*this);
 
   // Initialize logger. (Do not do this before this point because the
   // application has to be created for the logs to be put in the correct
@@ -91,7 +92,7 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) {
   initLocale();
 
   if (mParser->isSet("help")) {
-    parseArgs();
+    createParser();
     mParser->showHelp();
   }
 
@@ -272,7 +273,7 @@ bool App::hasFocus () const {
 
 // -----------------------------------------------------------------------------
 
-void App::parseArgs () {
+void App::createParser () {
   if (mParser)
     delete mParser;
 
@@ -290,8 +291,6 @@ void App::parseArgs () {
     { { "V", "verbose" }, tr("commandLineOptionVerbose") },
     { { "c", "cmd" }, tr("commandLineOptionCmd"), tr("commandLineOptionCmdArg") }
   });
-
-  mParser->process(*this);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/linphone-desktop/src/app/App.hpp b/linphone-desktop/src/app/App.hpp
index 69dabe524..c31a01f5a 100644
--- a/linphone-desktop/src/app/App.hpp
+++ b/linphone-desktop/src/app/App.hpp
@@ -87,7 +87,7 @@ signals:
   void configLocaleChanged (const QString &locale);
 
 private:
-  void parseArgs ();
+  void createParser ();
 
   void registerTypes ();
   void registerSharedTypes ();