diff options
author | Arno <arno@disconnect.de> | 2017-07-20 06:58:50 +0200 |
---|---|---|
committer | Arno <arno@disconnect.de> | 2017-07-20 06:58:50 +0200 |
commit | 4ebd741d2bd6061dd4812adf0a89bd0cdb81023d (patch) | |
tree | 3e39abb2b5b28c15bf34941e741c43bcda2e8ebb /pictureviewer2.cpp | |
parent | 7c6deee2325d83f711fd28767467865da7cda848 (diff) | |
download | SheMov-4ebd741d2bd6061dd4812adf0a89bd0cdb81023d.tar.gz SheMov-4ebd741d2bd6061dd4812adf0a89bd0cdb81023d.tar.bz2 SheMov-4ebd741d2bd6061dd4812adf0a89bd0cdb81023d.zip |
Fix one crash and compile issues
Don't access FileName in constructWindowTitle when we don't have a file
at mCurPos. That's what crashed us randomly!
Also (yes, I know, should be a separate commit) fix warnings about
implicit fallthru's in switch statements. The one in SmDirModel actually
was a bug, the one in tabChanged is just a nuisance.
Also (again), shuffle header inclusion in SmGlobals so Xlib and QT don't
clash.
Diffstat (limited to 'pictureviewer2.cpp')
-rw-r--r-- | pictureviewer2.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp index 965111c..98ab6b8 100644 --- a/pictureviewer2.cpp +++ b/pictureviewer2.cpp @@ -714,7 +714,13 @@ QPointF PictureViewer2::getPos(QGraphicsItem *item, int pos, const QPointF &movP } QString PictureViewer2::constructWindowTitle() const { - QString retval = QString(tr("PicViewer 2 - [%1]")).arg(mFiles.at(mCurPos).at(PicFilesModel::FileName).toString()); + QString f; + if(mCurPos < mFiles.size()){ + f = mFiles.at(mCurPos).at(PicFilesModel::FileName).toString(); + }else{ + f = tr("Oh shit..."); + } + QString retval = QString(tr("PicViewer 2 - [%1]")).arg(f); return retval; } |