From 41a06ed5bc736e4498b7a23714ee02e226455a0e Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 5 Mar 2011 12:54:10 +0100 Subject: Revert "Revert "Bugfix when doubleclicking on archived movie"" This reverts commit 465147eb8a3508859c6c1133b90db7ba85404427. --- filestreewidget.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'filestreewidget.cpp') diff --git a/filestreewidget.cpp b/filestreewidget.cpp index 0d8ae1f..4e2a196 100644 --- a/filestreewidget.cpp +++ b/filestreewidget.cpp @@ -268,23 +268,23 @@ void FilesTreeWidget::itemDoubleClicked(const QModelIndex &index){ if(mimeType.startsWith("image")){ mPictureViewer->showPic(file); return; + }else{ + int dvdNo = index.data(FilesTreeModel::DvdNoRole).toInt(); + if(dvdNo != -1){ + QString msg = QString(tr("%1 is archived on DVD %2.")).arg(index.data(FilesTreeModel::FileNameRole).toString()).arg(QString::number(index.data(FilesTreeModel::DvdNoRole).toInt())); + QMessageBox::critical(this, tr("Error"), msg); + return; + } + QPair data = Helper::programData("movieviewer", QString()); + if(data.first.isEmpty()){ + QMessageBox::critical(this, tr("Error"), tr("No viedeo viewer configured.")); + return; + } + QString program = data.first; + QStringList args = data.second; + args << file; + QProcess::startDetached(program, args); } - }else{ - int dvdNo = index.data(FilesTreeModel::DvdNoRole).toInt(); - if(dvdNo != -1){ - QString msg = QString(tr("%1 is archived on DVD %2.")).arg(index.data(FilesTreeModel::FileNameRole).toString()).arg(QString::number(index.data(FilesTreeModel::DvdNoRole).toInt())); - QMessageBox::critical(this, tr("Error"), msg); - return; - } - QPair data = Helper::programData("movieviewer", QString()); - if(data.first.isEmpty()){ - QMessageBox::critical(this, tr("Error"), tr("No viedeo viewer configured.")); - return; - } - QString program = data.first; - QStringList args = data.second; - args << file; - QProcess::startDetached(program, args); } } -- cgit v1.2.3-70-g09d2