From 226b55893d78a3057c97e9d78fef450688631520 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Wed, 19 Feb 2014 00:26:36 +0100 Subject: Make lastUsedImageDir static to prevent a crash Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- qt-ui/divelistview.h | 2 +- qt-ui/simplewidgets.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/divelistview.h b/qt-ui/divelistview.h index c77b85f24..f078a33f8 100644 --- a/qt-ui/divelistview.h +++ b/qt-ui/divelistview.h @@ -52,7 +52,7 @@ public slots: void shiftTimes(); void loadImages(); void uploadToDivelogsDE(); - QString lastUsedImageDir(); + static QString lastUsedImageDir(); signals: void currentDiveChanged(int divenr); diff --git a/qt-ui/simplewidgets.cpp b/qt-ui/simplewidgets.cpp index 4ee3998b9..e73b23560 100644 --- a/qt-ui/simplewidgets.cpp +++ b/qt-ui/simplewidgets.cpp @@ -180,9 +180,8 @@ void ShiftImageTimesDialog::syncCameraClicked() QDateTime dcDateTime = QDateTime(); QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Open Image File"), - MainWindow().dive_list()->lastUsedImageDir(), + DiveListView::lastUsedImageDir(), tr("Image Files (*.jpg *.jpeg *.pnm *.tif *.tiff)")); - if (fileNames.isEmpty()) return; -- cgit v1.2.3-70-g09d2