flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 17:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Validation for XP model directory in simulator basics

Browse Source
This commit is contained in:
Klaus Basan
2019-07-13 03:41:47 +02:00
committed by Mat Sutcliffe
parent 5799e31d27
commit 18778ed97e
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blackgui/components/settingssimulatorbasicscomponent.cpp
View File

@@ -140,21 +140,29 @@ namespace BlackGui
s.setSimulatorDirectory(simulatorDir);
s.setModelDirectories(modelDirs);
s.setModelExcludeDirectories(relativeDirs);
const CStatusMessage m = m_settings.setAndSaveSettings(s, simulator);
if (!m.isEmpty()) { CLogMessage::preformatted(m); }
if (m.isSuccess())
const CStatusMessageList msgs = m_settings.setAndValidateSettings(s, simulator);
if (msgs.isSuccess())
{
this->showOverlayHTMLMessage("Saved settings", 5000);
const CStatusMessage m = m_settings.setAndSaveSettings(s, simulator);
if (!m.isEmpty()) { CLogMessage::preformatted(m); }
if (m.isSuccess())
{
this->showOverlayHTMLMessage("Saved settings", 5000);
}
else
{
this->showOverlayMessage(m);
}
m_unsavedChanges = m_unsavedChanges && !m.isSuccess(); // reset if success, but only if there were changes
// display as it was saved
this->displaySettings(simulator);
}
else
{
this->showOverlayMessage(m);
this->showOverlayHTMLMessageOrMessages(msgs);
}
m_unsavedChanges = m_unsavedChanges && !m.isSuccess(); // reset if success, but only if there were changes
// display as saved
this->displaySettings(simulator);
}
void CSettingsSimulatorBasicsComponent::copyDefaults()