flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-03 16:25:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

[AFV] Ref T739 remove unused old coreaudio arguments

Browse Source
This commit is contained in:
Klaus Basan
2019-10-15 01:02:42 +02:00
parent a334b97ac6
commit 6cbd2d9486
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/application.cpp
View File

@@ -302,7 +302,8 @@ namespace BlackCore
static const QString launcher = CApplication::getExecutableForApplication(CApplicationInfo::Application::Laucher); static const QString launcher = CApplication::getExecutableForApplication(CApplicationInfo::Application::Laucher);
if (launcher.isEmpty() || CApplication::isApplicationRunning(CApplicationInfo::Laucher)) { return false; } if (launcher.isEmpty() || CApplication::isApplicationRunning(CApplicationInfo::Laucher)) { return false; }
const QStringList args = this->argumentsJoined({}, { "--dbus", "--core", "--coreaudio" }); // const QStringList args = this->argumentsJoined({}, { "--dbus", "--core", "--coreaudio" });
const QStringList args = this->argumentsJoined({}, { "--dbus", "--core" });
return QProcess::startDetached(launcher, args); return QProcess::startDetached(launcher, args);
} }

10
src/swiftcore/swiftcore.cpp
View File

@@ -157,7 +157,9 @@ void CSwiftCore::restart()
if (!sGui || sGui->isShuttingDown()) { return; } if (!sGui || sGui->isShuttingDown()) { return; }
ui->pb_Restart->setEnabled(false); ui->pb_Restart->setEnabled(false);
const QStringList args = this->getRestartCmdArgs(); const QStringList args = this->getRestartCmdArgs();
sGui->restartApplication(args, { "--coreaudio" }); sGui->restartApplication(args);
// sGui->restartApplication(args, { "--coreaudio" });
} }
void CSwiftCore::disconnectFromNetwork() void CSwiftCore::disconnectFromNetwork()
@@ -173,14 +175,14 @@ void CSwiftCore::disconnectFromNetwork()
QString CSwiftCore::getAudioCmdFromRadioButtons() const QString CSwiftCore::getAudioCmdFromRadioButtons() const
{ {
if (ui->rb_AudioOnCore->isChecked()) { return QStringLiteral("--coreaudio"); } // if (ui->rb_AudioOnCore->isChecked()) { return QStringLiteral("--coreaudio"); }
return {}; return {};
} }
QStringList CSwiftCore::getRestartCmdArgs() const QStringList CSwiftCore::getRestartCmdArgs() const
{ {
const QString coreAudio = this->getAudioCmdFromRadioButtons(); // const QString coreAudio = this->getAudioCmdFromRadioButtons();
QStringList cmds = ui->comp_DBusSelector->getDBusCmdLineArgs(); QStringList cmds = ui->comp_DBusSelector->getDBusCmdLineArgs();
if (!coreAudio.isEmpty()) { cmds.append(coreAudio); } // if (!coreAudio.isEmpty()) { cmds.append(coreAudio); }
return cmds; return cmds;
} }