From e171db6f294fe84c76f875e668081317e458ba92 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Sat, 1 Oct 2011 07:00:56 +0000 Subject: [PATCH] Fix dvd chapters discarded when opening from render dialog: http://kdenlive.org/mantis/view.php?id=2335 svn path=/trunk/kdenlive/; revision=5935 --- src/dvdwizardvob.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/dvdwizardvob.cpp b/src/dvdwizardvob.cpp index 2e4a0be1..68a2dfa3 100644 --- a/src/dvdwizardvob.cpp +++ b/src/dvdwizardvob.cpp @@ -129,8 +129,9 @@ void DvdWizardVob::slotAddVobFile(KUrl url, const QString &chapters) } delete producer; - if (chapters.isEmpty() == false) + if (chapters.isEmpty() == false) { item->setData(1, Qt::UserRole + 1, chapters); + } else if (QFile::exists(url.path() + ".dvdchapter")) { // insert chapters as children QFile file(url.path() + ".dvdchapter"); @@ -246,7 +247,9 @@ QStringList DvdWizardVob::chapters() const int max = m_view.vobs_list->topLevelItemCount(); for (int i = 0; i < max; i++) { QTreeWidgetItem *item = m_view.vobs_list->topLevelItem(i); - if (item) result.append(item->data(1, Qt::UserRole + 1).toString()); + if (item) { + result.append(item->data(1, Qt::UserRole + 1).toString()); + } } return result; } @@ -256,7 +259,7 @@ void DvdWizardVob::updateChapters(QMap chaptersdata) int max = m_view.vobs_list->topLevelItemCount(); for (int i = 0; i < max; i++) { QTreeWidgetItem *item = m_view.vobs_list->topLevelItem(i); - item->setData(1, Qt::UserRole + 1, chaptersdata.value(item->text(0))); + if (chaptersdata.contains(item->text(0))) item->setData(1, Qt::UserRole + 1, chaptersdata.value(item->text(0))); } } -- 2.39.2