From 4bc6e7a6d069c18c5b66e3403fa1f3f7e5a961d5 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Fri, 15 Jul 2016 22:48:37 +0100
Subject: [PATCH] Fix for launcher always enabling MP

---
 src/GUI/Launcher.ui    | 3 +++
 src/GUI/QtLauncher.cxx | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/GUI/Launcher.ui b/src/GUI/Launcher.ui
index 211442851..8cfced30b 100644
--- a/src/GUI/Launcher.ui
+++ b/src/GUI/Launcher.ui
@@ -507,6 +507,9 @@
          <property name="checkable">
           <bool>true</bool>
          </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
          <layout class="QGridLayout" name="gridLayout" columnstretch="1,2,0">
           <item row="0" column="0">
            <widget class="QLabel" name="label_9">
diff --git a/src/GUI/QtLauncher.cxx b/src/GUI/QtLauncher.cxx
index fa63c190c..64f5b76fa 100644
--- a/src/GUI/QtLauncher.cxx
+++ b/src/GUI/QtLauncher.cxx
@@ -729,6 +729,7 @@ void QtLauncher::restoreSettings()
 
     m_ui->commandLineArgs->setPlainText(settings.value("additional-args").toString());
 
+    m_ui->mpBox->setChecked(settings.value("mp-enabled").toBool());
     m_ui->mpCallsign->setText(settings.value("mp-callsign").toString());
     // don't restore MP server here, we do it after a refresh
     m_doRestoreMPServer = true;
@@ -773,6 +774,7 @@ void QtLauncher::saveSettings()
 
     settings.setValue("mp-callsign", m_ui->mpCallsign->text());
     settings.setValue("mp-server", m_ui->mpServerCombo->currentData());
+    settings.setValue("mp-enabled", m_ui->mpBox->isChecked());
 }
 
 void QtLauncher::setEnableDisableOptionFromCheckbox(QCheckBox* cbox, QString name) const
-- 
2.39.5