From 4ebd741d2bd6061dd4812adf0a89bd0cdb81023d Mon Sep 17 00:00:00 2001 From: Arno Date: Thu, 20 Jul 2017 06:58:50 +0200 Subject: 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. --- pictureviewer2.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pictureviewer2.cpp') 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; } -- cgit v1.2.3-70-g09d2