mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 01:43:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Map: remove skipReload logic in mapwidget.cpp

Browse source 
There used to be a flag to avoid reloading of the map. Since this
is not used anymore, remove it.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-05-05 14:58:04 +02:00 • committed by Dirk Hohndel
parent 15cb7e4e92
commit 4e81edcf1e
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
desktop-widgets/mapwidget.cpp
View file

@ -16,7 +16,6 @@
static const QUrl urlMapWidget = QUrl(QStringLiteral("qrc:/qml/MapWidget.qml"));
static const QUrl urlMapWidgetError = QUrl(QStringLiteral("qrc:/qml/MapWidgetError.qml"));
static bool isReady = false;
static bool skipReload = false;
#define CHECK_IS_READY_RETURN_VOID() \
if (!isReady) return
@ -55,8 +54,7 @@ void MapWidget::doneLoading(QQuickWidget::Status status)
void MapWidget::centerOnDiveSite(struct dive_site *ds)
{
CHECK_IS_READY_RETURN_VOID();
if (!skipReload)
m_mapHelper->centerOnDiveSite(ds);
m_mapHelper->centerOnDiveSite(ds);
}
void MapWidget::centerOnIndex(const QModelIndex& idx)
@ -78,10 +76,8 @@ void MapWidget::repopulateLabels()
void MapWidget::reload()
{
CHECK_IS_READY_RETURN_VOID();
if (!skipReload) {
m_mapHelper->reloadMapLocations();
m_mapHelper->centerOnSelectedDiveSite();
}
m_mapHelper->reloadMapLocations();
m_mapHelper->centerOnSelectedDiveSite();
}
void MapWidget::selectedDivesChanged(const QList<int> &list)