From b39f2406c6a520f0b3743324744f3c55914adc52 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 30 Aug 2019 16:51:59 +0200 Subject: Map: don't fully reset model on selection change When changing the selection the MapLocationModel was reset. This lead to crashes on Qt-5.9 which are due to QML accessing data that was freed during model reset. This putative Qt bug doesn't happen on newer Qt versions. At least Qt-5.12 is known to work. Instead of fighting the bug, let's simply not reset the model but send a dataChanged() for every element of the MapLocationModel. Signed-off-by: Berthold Stoeger --- desktop-widgets/mainwindow.cpp | 2 +- desktop-widgets/mapwidget.cpp | 7 +++++++ desktop-widgets/mapwidget.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 2a215b1b7..004d5823d 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -464,7 +464,7 @@ void MainWindow::selectionChanged() configureToolbar(); enableDisableOtherDCsActions(); } - MapWidget::instance()->reload(); + MapWidget::instance()->selectionChanged(); } void MainWindow::on_actionNew_triggered() diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp index 27c30686f..376a29998 100644 --- a/desktop-widgets/mapwidget.cpp +++ b/desktop-widgets/mapwidget.cpp @@ -84,6 +84,13 @@ bool MapWidget::editMode() const return isReady && m_mapHelper->editMode(); } +void MapWidget::selectionChanged() +{ + CHECK_IS_READY_RETURN_VOID(); + m_mapHelper->selectionChanged(); + m_mapHelper->centerOnSelectedDiveSite(); +} + void MapWidget::selectedDivesChanged(const QList &list) { CHECK_IS_READY_RETURN_VOID(); diff --git a/desktop-widgets/mapwidget.h b/desktop-widgets/mapwidget.h index bc9303166..9e05ce48f 100644 --- a/desktop-widgets/mapwidget.h +++ b/desktop-widgets/mapwidget.h @@ -23,6 +23,7 @@ public: static MapWidget *instance(); void reload(); + void selectionChanged(); bool editMode() const; public slots: -- cgit v1.2.3-70-g09d2