diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2015-07-31 22:25:43 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-08-03 22:19:36 -0700 |
| commit | 260ea879e5c574350cc966551d161df829306560 (patch) | |
| tree | 3064a2761587353ef46c4bec44ee7695e57cbb42 | |
| parent | faa1c281007b18a2b57bbb2642866598821b15c2 (diff) | |
| download | subsurface-260ea879e5c574350cc966551d161df829306560.tar.gz | |
Make debugging cleaner
Don't try to connect the globe when NOMARBLE is active.
Check exisistance before trying to open an image file.
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/maintab.cpp | 2 | ||||
| -rw-r--r-- | qthelper.cpp | 2 |
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(); |