From bfd3086ca606f74c4e471f3e3de65abf89bf8058 Mon Sep 17 00:00:00 2001
From: tux3 <barrdetwix@gmail.com>
Date: Tue, 9 Jun 2015 01:45:30 +0200
Subject: [PATCH] Fix #1840

---
 src/main.cpp | 56 ++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 56ea03795..811ccaf10 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -116,34 +116,6 @@ int main(int argc, char *argv[])
     IPC::getInstance();
 #endif
 
-    if (parser.isSet("p"))
-    {
-        QString profileName = parser.value("p");
-        if (Profile::exists(profileName))
-        {
-            qDebug() << "Setting profile to" << profileName;
-            if (Profile::isEncrypted(profileName))
-            {
-                Settings::getInstance().setCurrentProfile(profileName);
-            }
-            else
-            {
-                Profile* profile = Profile::loadProfile(profileName);
-                if (!profile)
-                {
-                    qCritical() << "-p profile" << profileName + ".tox" << " couldn't be loaded";
-                    return EXIT_FAILURE;
-                }
-                Nexus::getInstance().setProfile(profile);
-            }
-        }
-        else
-        {
-            qCritical() << "-p profile" << profileName + ".tox" << "doesn't exist";
-            return EXIT_FAILURE;
-        }
-    }
-
     sodium_init(); // For the auto-updater
 
 #ifdef LOG_TO_FILE
@@ -197,6 +169,34 @@ int main(int argc, char *argv[])
     if (ipc.isCurrentOwner())
         ProfileLocker::clearAllLocks();
 
+    if (parser.isSet("p"))
+    {
+        QString profileName = parser.value("p");
+        if (Profile::exists(profileName))
+        {
+            qDebug() << "Setting profile to" << profileName;
+            if (Profile::isEncrypted(profileName))
+            {
+                Settings::getInstance().setCurrentProfile(profileName);
+            }
+            else
+            {
+                Profile* profile = Profile::loadProfile(profileName);
+                if (!profile)
+                {
+                    qCritical() << "-p profile" << profileName + ".tox" << " couldn't be loaded";
+                    return EXIT_FAILURE;
+                }
+                Nexus::getInstance().setProfile(profile);
+            }
+        }
+        else
+        {
+            qCritical() << "-p profile" << profileName + ".tox" << "doesn't exist";
+            return EXIT_FAILURE;
+        }
+    }
+
     if (parser.positionalArguments().size() > 0)
     {
         QString firstParam(parser.positionalArguments()[0]);