Commit ea55acec authored by Gus Grubba's avatar Gus Grubba

Check for valid root object before invoking it

parent c5b77b18
...@@ -669,7 +669,9 @@ void QGCApplication::_missingParamsDisplay(void) ...@@ -669,7 +669,9 @@ void QGCApplication::_missingParamsDisplay(void)
QObject* QGCApplication::_rootQmlObject() QObject* QGCApplication::_rootQmlObject()
{ {
#ifdef __mobile__ #ifdef __mobile__
return _qmlAppEngine->rootObjects()[0]; if(_qmlAppEngine && _qmlAppEngine->rootObjects().size())
return _qmlAppEngine->rootObjects()[0];
return nullptr;
#else #else
MainWindow * mainWindow = MainWindow::instance(); MainWindow * mainWindow = MainWindow::instance();
if (mainWindow) { if (mainWindow) {
...@@ -711,12 +713,16 @@ void QGCApplication::showMessage(const QString& message) ...@@ -711,12 +713,16 @@ void QGCApplication::showMessage(const QString& message)
void QGCApplication::showSetupView(void) void QGCApplication::showSetupView(void)
{ {
QMetaObject::invokeMethod(_rootQmlObject(), "showSetupView"); if(_rootQmlObject()) {
QMetaObject::invokeMethod(_rootQmlObject(), "showSetupView");
}
} }
void QGCApplication::qmlAttemptWindowClose(void) void QGCApplication::qmlAttemptWindowClose(void)
{ {
QMetaObject::invokeMethod(_rootQmlObject(), "attemptWindowClose"); if(_rootQmlObject()) {
QMetaObject::invokeMethod(_rootQmlObject(), "attemptWindowClose");
}
} }
bool QGCApplication::isInternetAvailable() bool QGCApplication::isInternetAvailable()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment