From 5ca7f74c5b66cb9496f8a6aa4ecbb1f687247995 Mon Sep 17 00:00:00 2001 From: Arno Date: Fri, 13 May 2011 16:12:23 +0200 Subject: Fix NewMovieWizard - subtitle dupe checking Don't exit when there's already a SeriesPart zero. Since introducing subtitle zero is an indicator for a subtitle. --- newmoviewizard.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'newmoviewizard.cpp') diff --git a/newmoviewizard.cpp b/newmoviewizard.cpp index 88f0aab..44897b4 100644 --- a/newmoviewizard.cpp +++ b/newmoviewizard.cpp @@ -75,13 +75,23 @@ void NewMovieWizard::accept(){ if(!hasPartNo){ seriesno = 0; } + QString subTitle = field("subtitle").toString(); QModelIndex seriesPartIdx = seriesModel->find(seriesno, SeriesTreeModel::SeriesPart, seriesIdx); if(seriesPartIdx.isValid()){ - QString error = QString(tr("Already have part %1 of %2")).arg(seriesno).arg(series); - QMessageBox::critical(this, tr("Error"), error); - return; + if(hasPartNo){ + QString error = QString(tr("Already have part %1 of %2")).arg(seriesno).arg(series); + QMessageBox::critical(this, tr("Error"), error); + return; + }else{ + QString curSubTitle = seriesPartIdx.data(SeriesTreeModel::SubtitleRole).toString(); + if(curSubTitle == subTitle){ + QString error = QString(tr("Already have a part with subtitle %1")).arg(curSubTitle); + QMessageBox::critical(this, tr("Error"), error); + return; + } + } } - QString subTitle = field("subtitle").toString(); + if(!seriesModel->addSeriesPart(seriesno, seriesIdx, subTitle)){ QMessageBox::critical(this, tr("Error"), tr("Failed to create series part!")); return; -- cgit v1.2.3-70-g09d2