summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qt-ui/maintab.cpp2
-rw-r--r--qthelper.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index 369a754bc..443837a47 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -463,7 +463,9 @@ void MainTab::updateDiveInfo(bool clear)
// I don't like this code here - but globe() wasn't initialized on the constructor.
{
QListView *completerListview = qobject_cast<QListView*>(ui.location->completer()->popup());
+#ifndef NO_MARBLE
connect(completerListview, SIGNAL(entered(QModelIndex)), GlobeGPS::instance(), SLOT(centerOnIndex(QModelIndex)), Qt::UniqueConnection);
+#endif
}
EditMode rememberEM = editMode;
diff --git a/qthelper.cpp b/qthelper.cpp
index c6c7b9ef6..14a48c151 100644
--- a/qthelper.cpp
+++ b/qthelper.cpp
@@ -841,7 +841,7 @@ QByteArray hashFile(const QString filename)
{
QCryptographicHash hash(QCryptographicHash::Sha1);
QFile imagefile(filename);
- if (imagefile.open(QIODevice::ReadOnly)) {
+ if (imagefile.exists() && imagefile.open(QIODevice::ReadOnly)) {
hash.addData(&imagefile);
add_hash(filename, hash.result());
return hash.result();