[Kdenlive-svn] SF.net SVN: kdenlive:[5935] trunk/kdenlive/src/dvdwizardvob.cpp

[<j-...@us...>]

Revision: 5935
          http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5935&view=rev
Author:   j-b-m
Date:     2011-10-01 07:00:56 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
Fix dvd chapters discarded when opening from render dialog:
http://kdenlive.org/mantis/view.php?id=2335

Modified Paths:
--------------
    trunk/kdenlive/src/dvdwizardvob.cpp

Modified: trunk/kdenlive/src/dvdwizardvob.cpp
===================================================================
--- trunk/kdenlive/src/dvdwizardvob.cpp	2011-10-01 06:25:23 UTC (rev 5934)
+++ trunk/kdenlive/src/dvdwizardvob.cpp	2011-10-01 07:00:56 UTC (rev 5935)
@@ -129,8 +129,9 @@
     }
     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 @@
     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 @@
     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)));
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.