Merge pull request #10418 from volansystech/Bug-4255-HMD-file-quit-AppCrashes

Bug 4255: When you are in HMD and you go to file menu quit, it crashe…
This commit is contained in:
druiz17 2017-05-10 08:50:11 -07:00 committed by GitHub
commit ec5dd04230

View file

@ -250,6 +250,10 @@ static void addButtonProxyToQmlTablet(QQuickItem* qmlTablet, TabletButtonProxy*
if (QThread::currentThread() != qmlTablet->thread()) {
connectionType = Qt::BlockingQueuedConnection;
}
if (buttonProxy == NULL){
qCCritical(scriptengine) << "TabletScriptingInterface addButtonProxyToQmlTablet buttonProxy is NULL";
return;
}
bool hasResult = QMetaObject::invokeMethod(qmlTablet, "addButtonProxy", connectionType,
Q_RETURN_ARG(QVariant, resultVar), Q_ARG(QVariant, buttonProxy->getProperties()));
if (!hasResult) {