fly/flightgear
1
0
Fork 0
Code Activity

Fix for launcher always enabling MP

Browse source
This commit is contained in:
James Turner 2016-07-15 22:48:37 +01:00
parent 100e8bf2b2
commit c0d93235de
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/GUI/Launcher.ui
View file

@ -507,6 +507,9 @@
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout" columnstretch="1,2,0"> <layout class="QGridLayout" name="gridLayout" columnstretch="1,2,0">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label_9">

2
src/GUI/QtLauncher.cxx
View file

@ -729,6 +729,7 @@ void QtLauncher::restoreSettings()
m_ui->commandLineArgs->setPlainText(settings.value("additional-args").toString()); 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()); m_ui->mpCallsign->setText(settings.value("mp-callsign").toString());
// don't restore MP server here, we do it after a refresh // don't restore MP server here, we do it after a refresh
m_doRestoreMPServer = true; m_doRestoreMPServer = true;
@ -773,6 +774,7 @@ void QtLauncher::saveSettings()
settings.setValue("mp-callsign", m_ui->mpCallsign->text()); settings.setValue("mp-callsign", m_ui->mpCallsign->text());
settings.setValue("mp-server", m_ui->mpServerCombo->currentData()); settings.setValue("mp-server", m_ui->mpServerCombo->currentData());
settings.setValue("mp-enabled", m_ui->mpBox->isChecked());
} }
void QtLauncher::setEnableDisableOptionFromCheckbox(QCheckBox* cbox, QString name) const void QtLauncher::setEnableDisableOptionFromCheckbox(QCheckBox* cbox, QString name) const