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

[AFV] Fixed context unittest that was broken by audio context changes

Browse Source
This commit is contained in:
Mat Sutcliffe
2019-10-06 16:40:04 +01:00
parent b90855d393
commit ec0a20b1d1
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackcore/actionbind.cpp
View File

@@ -18,7 +18,8 @@ namespace BlackCore
QString CActionBind::registerAction(const QString &action, const QPixmap &icon)
{
if (!sApp || sApp->isShuttingDown()) return {};
if (!sApp || sApp->isShuttingDown()) { return {}; }
if (sApp->getApplicationInfo().isUnitTest()) { return {}; }
const QString a = CActionBind::normalizeAction(action);
Q_ASSERT_X(sApp && sApp->getInputManager(), Q_FUNC_INFO, "Missing input manager");
@@ -34,6 +35,8 @@ namespace BlackCore
void CActionBind::unbind()
{
if (m_index < 0) { return; }
if (sApp->getApplicationInfo().isUnitTest()) { return; }
Q_ASSERT_X(sApp && sApp->getInputManager(), Q_FUNC_INFO, "Missing input manager");
sApp->getInputManager()->unbind(m_index);
m_index = -1;

1
src/blackcore/actionbind.h
View File

@@ -39,6 +39,7 @@ namespace BlackCore
{
// workaround if a binding is taking place in an empty context
if (!sApp || sApp->isShuttingDown()) { return; }
if (sApp->getApplicationInfo().isUnitTest()) { return; }
const QString a = CActionBind::registerAction(action, icon);
Q_ASSERT_X(sApp && sApp->getInputManager(), Q_FUNC_INFO, "Missing input manager");

2
src/blackcore/application.cpp
View File

@@ -1369,7 +1369,7 @@ namespace BlackCore
}
const QStringList verifyErrors = CDirectoryUtils::verifyRuntimeDirectoriesAndFiles();
if (!verifyErrors.isEmpty())
if (!verifyErrors.isEmpty() && !m_applicationInfo.isUnitTest())
{
this->cmdLineErrorMessage("Missing runtime directories/files: " + verifyErrors.join(", "));
return false;