diff options
| -rw-r--r-- | desktop-widgets/divelistview.cpp | 5 | ||||
| -rw-r--r-- | desktop-widgets/subsurfacewebservices.cpp | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp index 0aea54f2a..0c1ea91e7 100644 --- a/desktop-widgets/divelistview.cpp +++ b/desktop-widgets/divelistview.cpp @@ -906,7 +906,6 @@ void DiveListView::contextMenuEvent(QContextMenuEvent *event) event->accept(); } - void DiveListView::shiftTimes() { ShiftTimesDialog::instance()->show(); @@ -950,7 +949,6 @@ void DiveListView::loadWebImages() if (!urlDialog.exec()) return; loadImageFromURL(QUrl::fromUserInput(urlDialog.url())); - } void DiveListView::loadImageFromURL(QUrl url) @@ -993,11 +991,8 @@ void DiveListView::loadImageFromURL(QUrl url) matchImagesToDives(QStringList(url.toString())); } } - - } - QString DiveListView::lastUsedImageDir() { QSettings settings; diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp index 68b7737c3..74868d2bd 100644 --- a/desktop-widgets/subsurfacewebservices.cpp +++ b/desktop-widgets/subsurfacewebservices.cpp @@ -384,8 +384,7 @@ SubsurfaceWebServices::SubsurfaceWebServices(QWidget *parent, Qt::WindowFlags f) // figure out if we know (or can determine) the user's web service userid QString userid(prefs.userid); - if (userid.isEmpty()) - userid = s.value("subsurface_webservice_uid").toString().toUpper(); + if (userid.isEmpty() && !same_string(prefs.cloud_storage_email, "") && !same_string(prefs.cloud_storage_password, "")) |