1 files changed, 7 insertions, 8 deletions

diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp
index 10ce7058b..e0f94bbd5 100644
--- a/qt-ui/globe.cpp
+++ b/qt-ui/globe.cpp
@@ -197,23 +197,21 @@ void GlobeGPS::reload()
 {
 	editingDiveLocation = false;
 	if (messageWidget->isVisible())
-		messageWidget->animatedHide();
+		messageWidget->hide();
 	repopulateLabels();
 }
 
 void GlobeGPS::centerOn(dive* dive)
 {
 	// dive has changed, if we had the 'editingDive', hide it.
-	if (messageWidget->isVisible() && (!dive || dive_has_gps_location(dive))) {
-		messageWidget->animatedHide();
-	}
+	if (messageWidget->isVisible() && (!dive || dive_has_gps_location(dive)))
+		messageWidget->hide();
 	if (!dive)
 		return;
-
 	qreal longitude = dive->longitude.udeg / 1000000.0;
 	qreal latitude = dive->latitude.udeg / 1000000.0;
 
-	if (!longitude || !latitude) {
+	if (!longitude || !latitude || mainWindow()->information()->isEditing()) {
 		prepareForGetDiveCoordinates();
 		return;
 	}
@@ -241,7 +239,7 @@ void GlobeGPS::prepareForGetDiveCoordinates()
 {
 	if (!messageWidget->isVisible()) {
 		messageWidget->setMessageType(KMessageWidget::Warning);
-		messageWidget->setText(QObject::tr("No location data - move the map and double-click to set the dive location"));
+		messageWidget->setText(QObject::tr("Move the map and double-click to set the dive location"));
 		messageWidget->setWordWrap(true);
 		messageWidget->animatedShow();
 		editingDiveLocation = true;
@@ -250,6 +248,8 @@ void GlobeGPS::prepareForGetDiveCoordinates()
 
 void GlobeGPS::changeDiveGeoPosition(qreal lon, qreal lat, GeoDataCoordinates::Unit unit)
 {
+	messageWidget->hide();
+
 	if (mainWindow()->dive_list()->selectionModel()->selection().isEmpty())
 		return;
 
@@ -271,7 +271,6 @@ void GlobeGPS::changeDiveGeoPosition(qreal lon, qreal lat, GeoDataCoordinates::U
 	centerOn(lon, lat, true);
 	editingDiveLocation = false;
 	mark_divelist_changed(TRUE);
-	messageWidget->animatedHide();
 	mainWindow()->refreshDisplay();
 }