frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

chore: fix JsonAPI

Browse Source
This commit is contained in:
Paulchen Panther 2020-04-17 20:16:33 +02:00 committed by GitHub
parent 9ca197ea78
commit 2e578c1947
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/api/API.cpp
View File

@ -269,12 +269,12 @@ bool API::setHyperionInstance(const quint8 &inst)
if (_currInstanceIndex == inst) if (_currInstanceIndex == inst)
return true; return true;
bool isRunning; bool isRunning;
QMetaObject::invokeMethod(_instanceManager, "IsInstanceRunning", Qt::BlockingQueuedConnection, Q_RETURN_ARG(bool, isRunning), Q_ARG(quint8, inst)); QMetaObject::invokeMethod(_instanceManager, "IsInstanceRunning", Qt::DirectConnection, Q_RETURN_ARG(bool, isRunning), Q_ARG(quint8, inst));
if (!isRunning) if (!isRunning)
return false; return false;
disconnect(_hyperion, 0, this, 0); disconnect(_hyperion, 0, this, 0);
QMetaObject::invokeMethod(_instanceManager, "getHyperionInstance", Qt::BlockingQueuedConnection, Q_RETURN_ARG(Hyperion *, _hyperion), Q_ARG(quint8, inst)); QMetaObject::invokeMethod(_instanceManager, "getHyperionInstance", Qt::DirectConnection, Q_RETURN_ARG(Hyperion *, _hyperion), Q_ARG(quint8, inst));
_currInstanceIndex = inst; _currInstanceIndex = inst;
return true; return true;
} }
@ -296,7 +296,7 @@ bool API::isHyperionEnabled()
QVector<QVariantMap> API::getAllInstanceData(void) QVector<QVariantMap> API::getAllInstanceData(void)
{ {
QVector<QVariantMap> vec; QVector<QVariantMap> vec;
QMetaObject::invokeMethod(_instanceManager, "getInstanceData", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QVector<QVariantMap>, vec)); QMetaObject::invokeMethod(_instanceManager, "getInstanceData", Qt::DirectConnection, Q_RETURN_ARG(QVector<QVariantMap>, vec));
return vec; return vec;
} }
@ -333,7 +333,7 @@ QString API::createInstance(const QString &name)
if (_adminAuthorized) if (_adminAuthorized)
{ {
bool success; bool success;
QMetaObject::invokeMethod(_instanceManager, "createInstance", Qt::BlockingQueuedConnection, Q_RETURN_ARG(bool, success), Q_ARG(QString, name)); QMetaObject::invokeMethod(_instanceManager, "createInstance", Qt::DirectConnection, Q_RETURN_ARG(bool, success), Q_ARG(QString, name));
if (!success) if (!success)
return QString("Instance name '%1' is already in use").arg(name); return QString("Instance name '%1' is already in use").arg(name);