diff options
| -rw-r--r-- | map-widget/qml/MapWidget.qml | 2 | ||||
| -rw-r--r-- | qt-models/maplocationmodel.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/map-widget/qml/MapWidget.qml b/map-widget/qml/MapWidget.qml index 88e9d95a6..602b7c338 100644 --- a/map-widget/qml/MapWidget.qml +++ b/map-widget/qml/MapWidget.qml @@ -69,7 +69,7 @@ Item { drag.target: (mapHelper.editMode && mapHelper.model.isSelected(model.divesite)) ? mapItem : undefined anchors.fill: parent onClicked: { - if (!mapHelper.editMode) + if (!mapHelper.editMode && model.divesite) mapHelper.model.setSelected(model.divesite, true) } onDoubleClicked: map.doubleClickHandler(mapItem.coordinate) diff --git a/qt-models/maplocationmodel.cpp b/qt-models/maplocationmodel.cpp index 1acea421e..da0ec7337 100644 --- a/qt-models/maplocationmodel.cpp +++ b/qt-models/maplocationmodel.cpp @@ -196,6 +196,8 @@ void MapLocationModel::reload(QObject *map) void MapLocationModel::setSelected(struct dive_site *ds, bool fromClick) { m_selectedDs.clear(); + if (!ds) + return; m_selectedDs.append(ds); if (fromClick) emit selectedLocationChanged(getMapLocation(ds)); |