flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #692, only save data for successful login to VATSIM

Browse Source
This commit is contained in:
Klaus Basan
2016-07-19 04:18:45 +02:00
parent 8278fb262e
commit 7aed12d871
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/blackgui/components/logincomponent.cpp
View File

@@ -205,7 +205,6 @@ namespace BlackGui
CStatusMessage msg; CStatusMessage msg;
if (!isConnected) if (!isConnected)
{ {
if (!this->ps_validateAircraftValues()) if (!this->ps_validateAircraftValues())
{ {
CLogMessage(this).validationWarning("Invalid aircraft data, login not possible"); CLogMessage(this).validationWarning("Invalid aircraft data, login not possible");
@@ -287,6 +286,12 @@ namespace BlackGui
// Login // Login
msg = sGui->getIContextNetwork()->connectToNetwork(currentServer, mode); msg = sGui->getIContextNetwork()->connectToNetwork(currentServer, mode);
if (msg.isSuccess() && vatsimLogin)
{
Q_ASSERT_X(currentServer.isValidForLogin(), Q_FUNC_INFO, "invalid server");
this->m_currentVatsimServer.set(currentServer);
this->m_currentAircraftModel.setAndSave(ownAircraft.getModel());
}
} }
else else
{ {
@@ -298,14 +303,9 @@ namespace BlackGui
// log message and trigger events // log message and trigger events
msg.addCategories(this); msg.addCategories(this);
CLogMessage::preformatted(msg); CLogMessage::preformatted(msg);
if (msg.isSeverityInfoOrLess()) if (msg.isSuccess())
{ {
emit loginOrLogoffSuccessful(); emit loginOrLogoffSuccessful();
if (vatsimLogin)
{
this->m_currentVatsimServer.set(currentServer);
this->m_currentAircraftModel.setAndSave(ownAircraft.getModel());
}
} }
else else
{ {
@@ -484,19 +484,19 @@ namespace BlackGui
{ {
CGuiAircraftValues values = getAircraftValuesFromGui(); CGuiAircraftValues values = getAircraftValuesFromGui();
bool validCombinedType = CAircraftIcaoCode::isValidCombinedType(values.ownAircraftCombinedType); const bool validCombinedType = CAircraftIcaoCode::isValidCombinedType(values.ownAircraftCombinedType);
this->ui->lblp_AircraftCombinedType->setTicked(validCombinedType); this->ui->lblp_AircraftCombinedType->setTicked(validCombinedType);
bool validAirlineDesignator = values.ownAircraftIcaoAirline.isEmpty() || CAircraftIcaoCode::isValidDesignator(values.ownAircraftIcaoAirline); const bool validAirlineDesignator = values.ownAircraftIcaoAirline.isEmpty() || CAircraftIcaoCode::isValidDesignator(values.ownAircraftIcaoAirline);
this->ui->lblp_AircraftIcaoAirline->setTicked(validAirlineDesignator); this->ui->lblp_AircraftIcaoAirline->setTicked(validAirlineDesignator);
bool validIcaoDesignator = CAircraftIcaoCode::isValidDesignator(values.ownAircraftIcaoTypeDesignator); const bool validIcaoDesignator = CAircraftIcaoCode::isValidDesignator(values.ownAircraftIcaoTypeDesignator);
this->ui->lblp_AircraftIcaoDesignator->setTicked(validIcaoDesignator); this->ui->lblp_AircraftIcaoDesignator->setTicked(validIcaoDesignator);
bool validCallsign = CCallsign::isValidAircraftCallsign(values.ownCallsign); const bool validCallsign = CCallsign::isValidAircraftCallsign(values.ownCallsign);
this->ui->lblp_Callsign->setTicked(validCallsign); this->ui->lblp_Callsign->setTicked(validCallsign);
bool validSimulatorModel = !values.ownAircraftSimulatorModel.isEmpty(); const bool validSimulatorModel = !values.ownAircraftSimulatorModel.isEmpty();
this->ui->lblp_SimulatorModel->setTicked(validSimulatorModel); this->ui->lblp_SimulatorModel->setTicked(validSimulatorModel);
// model intentionally ignored // model intentionally ignored
@@ -507,16 +507,16 @@ namespace BlackGui
{ {
CVatsimValues values = getVatsimValuesFromGui(); CVatsimValues values = getVatsimValuesFromGui();
bool validVatsimId = CUser::isValidVatsimId(values.vatsimId); const bool validVatsimId = CUser::isValidVatsimId(values.vatsimId);
this->ui->lblp_VatsimId->setTicked(validVatsimId); this->ui->lblp_VatsimId->setTicked(validVatsimId);
bool validHomeAirport = values.vatsimHomeAirport.isEmpty() || CAirportIcaoCode::isValidIcaoDesignator(values.vatsimHomeAirport); const bool validHomeAirport = values.vatsimHomeAirport.isEmpty() || CAirportIcaoCode::isValidIcaoDesignator(values.vatsimHomeAirport);
this->ui->lblp_VatsimHomeAirport->setTicked(validHomeAirport); this->ui->lblp_VatsimHomeAirport->setTicked(validHomeAirport);
bool validVatsimPassword = !values.vatsimPassword.isEmpty(); const bool validVatsimPassword = !values.vatsimPassword.isEmpty();
this->ui->lblp_VatsimPassword->setTicked(validVatsimPassword); this->ui->lblp_VatsimPassword->setTicked(validVatsimPassword);
bool validRealUserName = !values.vatsimRealName.isEmpty(); const bool validRealUserName = !values.vatsimRealName.isEmpty();
this->ui->lblp_VatsimRealName->setTicked(validRealUserName); this->ui->lblp_VatsimRealName->setTicked(validRealUserName);
return validVatsimId && validHomeAirport && validVatsimPassword && validRealUserName; return validVatsimId && validHomeAirport && validVatsimPassword && validRealUserName;