From ad9d1a81a2573360e42dc55f9d6dfd2e1f0631ab Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Sun, 31 May 2015 19:40:39 -0300 Subject: Don't ask for a GeoCoordinate when editing a dive This should be asked when we are in dive_site_edit mode. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/maintab.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 61687db01..720193a6b 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -343,10 +343,6 @@ void MainTab::enableEdition(EditMode newEditMode) MainWindow::instance()->dive_list()->setEnabled(false); MainWindow::instance()->setEnabledToolbar(false); - // only setup the globe for editing if we are editing exactly one existing dive - if (amount_selected == 1 && newEditMode != ADD) - MainWindow::instance()->globe()->prepareForGetDiveCoordinates(); - if (isTripEdit) { // we are editing trip location and notes displayMessage(tr("This trip is being edited.")); @@ -1265,7 +1261,7 @@ void MainTab::on_location_currentTextChanged(const QString &text) free(displayedTrip.location); displayedTrip.location = strdup(qPrintable(ui.location->currentText())); } - if (current_dive && text == QString(get_dive_site_by_uuid(current_dive->dive_site_uuid)->name)) + if (current_dive && text == QString(get_dive_site_by_uuid(displayed_dive.dive_site_uuid)->name)) return; uint32_t uuid = ui.location->currentData(LocationInformationModel::DIVE_SITE_UUID).toInt(); -- cgit v1.2.3-70-g09d2