summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArno <arno@disconnect.de>2017-12-27 11:41:54 +0100
committerArno <arno@disconnect.de>2017-12-27 11:41:54 +0100
commit3106d58f45ebfd3a0fda56acaa5e9bfabab99981 (patch)
treef64fcc254619b61f3c04ec01e125fd421e97f448
parent2dfaf19f50493373b36840d5c46b738da1b1757b (diff)
downloadSheMov-3106d58f45ebfd3a0fda56acaa5e9bfabab99981.tar.gz
SheMov-3106d58f45ebfd3a0fda56acaa5e9bfabab99981.tar.bz2
SheMov-3106d58f45ebfd3a0fda56acaa5e9bfabab99981.zip
Don't crash when doubleclicking an Origin file
Bail out if we have FT_ORIGIN. This file will never be present. Also check harder what title to set in pictureviewer2.cpp, if any.
-rw-r--r--archivecontroller.cpp2
-rw-r--r--pictureviewer2.cpp8
2 files changed, 8 insertions, 2 deletions
diff --git a/archivecontroller.cpp b/archivecontroller.cpp
index ffee2e1..b250337 100644
--- a/archivecontroller.cpp
+++ b/archivecontroller.cpp
@@ -395,6 +395,8 @@ void ArchiveController::fileDoubleClicked(const QModelIndex &idx){
args << idx.data(ArchiveFilesModel::FullPathRole).toString();
QProcess::startDetached(playerData.first, args);
return;
+ }else if(type == FT_ORIGIN){
+ return;
}
PictureViewer2 *pv = SmGlobals::instance()->pictureViewer();
QModelIndex parent = idx.parent();
diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp
index 98ab6b8..42f77fe 100644
--- a/pictureviewer2.cpp
+++ b/pictureviewer2.cpp
@@ -716,8 +716,12 @@ QPointF PictureViewer2::getPos(QGraphicsItem *item, int pos, const QPointF &movP
QString PictureViewer2::constructWindowTitle() const {
QString f;
if(mCurPos < mFiles.size()){
- f = mFiles.at(mCurPos).at(PicFilesModel::FileName).toString();
- }else{
+ PicData pd = mFiles.at(mCurPos);
+ if(!pd.isEmpty()){
+ f = pd.at(PicFilesModel::FileName).toString();
+ }
+ }
+ if(f.isEmpty()){
f = tr("Oh shit...");
}
QString retval = QString(tr("PicViewer 2 - [%1]")).arg(f);