diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-04-03 11:52:46 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-04-03 11:52:46 -0700 |
| commit | 7e73b30e974064235a9a52f543a3620eca0f20a7 (patch) | |
| tree | 7ff86e1203c6ba075d722d49a5ce9419221c64d9 /desktop-widgets/mainwindow.cpp | |
| parent | ceaf26d198f9795fde5da43be6a904bc3c133a98 (diff) | |
| download | subsurface-7e73b30e974064235a9a52f543a3620eca0f20a7.tar.gz | |
Revert "GPS: use applyGpsLocation::applyLocations from core"
This reverts commit 70e0e80de5470216df939f994ffda0222560def0.
This caused the GPS workflow to break for Linus. Let's revert
for 4.7.8 and figure out how to do this cleanup correctly, later.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'desktop-widgets/mainwindow.cpp')
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 4027c6d61..28366a8f1 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -101,8 +101,7 @@ MainWindow::MainWindow() : QMainWindow(), actionPreviousDive(0), helpView(0), state(VIEWALL), - survey(0), - locationProvider(new GpsLocation(nullptr, this)) + survey(0) { Q_ASSERT_X(m_Instance == NULL, "MainWindow", "MainWindow recreated!"); m_Instance = this; @@ -867,6 +866,7 @@ void MainWindow::on_actionDownloadDC_triggered() void MainWindow::on_actionDownloadWeb_triggered() { SubsurfaceWebServices dlg(this); + dlg.exec(); } |