Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/AutoPilotPlugins/AutoPilotPlugin.cc
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
#include "AutoPilotPlugin.h"
#include "FirmwarePlugin.h"
#include "AppMessages.h"
#include "QGCApplication.h"
#include "QGCLoggingCategory.h"
#include "Vehicle.h"
#include "VehicleComponent.h"

#include <QtCore/QCoreApplication>

QGC_LOGGING_CATEGORY(AutoPilotPluginLog, "AutoPilotPlugins.AutoPilotPlugin");

AutoPilotPlugin::AutoPilotPlugin(Vehicle *vehicle, QObject *parent)
Expand Down Expand Up @@ -60,10 +57,7 @@ void AutoPilotPlugin::parametersReadyPreChecks()
}

if (!_setupComplete) {
// Take the user to Vehicle Config Summary
qgcApp()->showVehicleConfig();
QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
QGC::showAppMessage(tr("One or more vehicle components require setup prior to flight."));
QGC::showAppMessage(tr("Configuration tasks remain before this vehicle is ready to fly. See Vehicle Configuration for details."));
}
}

Expand Down
7 changes: 0 additions & 7 deletions src/QGCApplication.cc
Original file line number Diff line number Diff line change
Expand Up @@ -490,13 +490,6 @@ QQuickWindow* QGCApplication::mainRootWindow()
return _mainRootWindow;
}

void QGCApplication::showVehicleConfig()
{
if (_rootQmlObject()) {
QMetaObject::invokeMethod(_rootQmlObject(), "showVehicleConfig");
}
}

void QGCApplication::qmlAttemptWindowClose()
{
if (_rootQmlObject()) {
Expand Down
2 changes: 0 additions & 2 deletions src/QGCApplication.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ class QGCApplication : public QGuiApplication
void languageChanged(const QLocale &locale);

public slots:
void showVehicleConfig();

void qmlAttemptWindowClose();

/// Get current language
Expand Down
Loading