diff options
author | Tomaz Canabrava <tomaz.canabrava@intel.com> | 2015-06-22 16:09:15 -0300 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-06-22 17:01:52 -0700 |
commit | 7071bf0e238138f17254b66525d790d176b49a6f (patch) | |
tree | ee0fbd4e0cdcfa8e58036aa9e1528626b2bc9b5b | |
parent | 35a4ef88be9e347b2aa5099a72411d9b1dae9284 (diff) | |
download | subsurface-7071bf0e238138f17254b66525d790d176b49a6f.tar.gz |
Do not mess with dive location automatically
This might be what the user wanted, but also might not
be it. So wait for the user to request it manually.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | parse-xml.c | 3 | ||||
-rw-r--r-- | qt-ui/mainwindow.cpp | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/parse-xml.c b/parse-xml.c index 381bd3823..4b6901f7f 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -1167,7 +1167,6 @@ static void gps_location(char *buffer, struct dive_site *ds) /* this is in qthelper.cpp, so including the .h file is a pain */ extern const char *printGPSCoords(int lat, int lon); -extern void add_geo_information_for_lookup(degrees_t latitude, degrees_t longitude, uint32_t uuid); static void gps_in_dive(char *buffer, struct dive *dive) { @@ -1213,8 +1212,6 @@ static void gps_in_dive(char *buffer, struct dive *dive) ds->longitude = longitude; } } - if (ds && (!ds->notes || strstr(ds->notes, "countrytag:") == NULL)) - add_geo_information_for_lookup(latitude, longitude, dive->dive_site_uuid); } static void add_dive_site(char *ds_name, struct dive *dive) diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 349b84aec..fd85b2c8a 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -1542,9 +1542,6 @@ void MainWindow::loadFiles(const QStringList fileNames) addRecentFile(fileNames); removeRecentFile(failedParses); - // searches for geo lookup information in a thread so it doesn`t - // freezes the ui. - ReverseGeoLookupThread::instance()->start(); refreshDisplay(); ui.actionAutoGroup->setChecked(autogroup); |