diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index c8bf39118f9a4365d574291a7684c52028f69d65..77183241236be67e2f0e845f24967c768d651704 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -395,7 +395,7 @@ void MainWindow::_buildCommonWidgets(void) // Log player // TODO: Make this optional with a preferences setting or under a "View" menu - logPlayer = new QGCMAVLinkLogPlayer(MAVLinkProtocol::instance(), statusBar()); + logPlayer = new QGCMAVLinkLogPlayer(statusBar()); statusBar()->addPermanentWidget(logPlayer); // In order for Qt to save and restore state of widgets all widgets must be created ahead of time. We only create the QDockWidget diff --git a/src/ui/QGCMAVLinkLogPlayer.cc b/src/ui/QGCMAVLinkLogPlayer.cc index 9b942f556ef5fd92c343942a7691ae6ab3594955..eaf7d5f11ded2ca8b0f3fa2f6bccd11b50c4667d 100644 --- a/src/ui/QGCMAVLinkLogPlayer.cc +++ b/src/ui/QGCMAVLinkLogPlayer.cc @@ -13,13 +13,11 @@ #include "QGCFileDialog.h" #include "QGCMessageBox.h" -QGCMAVLinkLogPlayer::QGCMAVLinkLogPlayer(MAVLinkProtocol* mavlink, QWidget *parent) : +QGCMAVLinkLogPlayer::QGCMAVLinkLogPlayer(QWidget *parent) : QWidget(parent), _replayLink(NULL), _ui(new Ui::QGCMAVLinkLogPlayer) -{ - Q_ASSERT(mavlink); - +{ _ui->setupUi(this); _ui->horizontalLayout->setAlignment(Qt::AlignTop); diff --git a/src/ui/QGCMAVLinkLogPlayer.h b/src/ui/QGCMAVLinkLogPlayer.h index 181355b5caf2a4f810f673cd0a64d1075755de4a..a347e931ad620f6cf44026cd2689d1ae08401555 100644 --- a/src/ui/QGCMAVLinkLogPlayer.h +++ b/src/ui/QGCMAVLinkLogPlayer.h @@ -25,7 +25,7 @@ class QGCMAVLinkLogPlayer : public QWidget Q_OBJECT public: - explicit QGCMAVLinkLogPlayer(MAVLinkProtocol* mavlink, QWidget *parent = 0); + explicit QGCMAVLinkLogPlayer(QWidget *parent = 0); ~QGCMAVLinkLogPlayer(); private slots: