mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-23 07:15:35 +08:00
Remove the warning about conflicting X-Plane plugins
This warning got superseded by the return value from CTraffic::acquireMultiplayerPlanes. All plugins can live side by side as long as nobody else has multiplayer planes acquired. If so, we warn the user directly and tell him the plugin name.
This commit is contained in:
committed by
Klaus Basan
parent
425274d9c2
commit
060c3ee492
@@ -213,20 +213,6 @@ namespace BlackCore
|
||||
{
|
||||
msgs.push_back(CStatusMessage(this).error("No model set so far, you need at least one model set. Hint: You can create a model set in the mapping tool, or copy an existing set in the launcher."));
|
||||
}
|
||||
else if (simulators.isXPlane() || CSimulatorInfo(m_enabledSimulators.get()).isXPlane())
|
||||
{
|
||||
// ever used with XPlane
|
||||
const QString pluginDir = CXPlaneUtil::pluginDirFromRootDir(m_simulatorSettings.getSimulatorDirectoryOrDefault(CSimulatorInfo::XPLANE));
|
||||
if (CDirectoryUtils::isDirExisting(pluginDir))
|
||||
{
|
||||
// only check if we are on a XP machine
|
||||
const QStringList conflicts = CXPlaneUtil::findConflictingPlugins(pluginDir);
|
||||
if (!conflicts.isEmpty())
|
||||
{
|
||||
msgs.push_back(CStatusMessage(this).warning("Possible conflict with other XPlane plugins: '%1'") << (conflicts.join(", ")));
|
||||
}
|
||||
}
|
||||
}
|
||||
return msgs;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user