Various fixes to improve general stability in Qt 4.5.2

[kdenlive] / src / documentvalidator.cpp

diff --git a/src/documentvalidator.cpp b/src/documentvalidator.cpp
index e28d3d1c72511e1bc9c403be1046798d5a324423..bb6d8999b4f7fa76e18b5c69d8b1e779c272eb1a 100644 (file)
--- a/src/documentvalidator.cpp
+++ b/src/documentvalidator.cpp
@@ -128,8 +128,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion)
 
     // No conversion needed
     if (version == currentVersion) {
-        // TODO: uncomment when currentVersion == 0.84
-        //return true;
+        return true;
     }
 
     // The document is too new
@@ -675,7 +674,7 @@ bool DocumentValidator::upgrade(double version, const double currentVersion)
     if (version <= 0.83) {
         // Replace point size with pixel size in text titles
         if (m_doc.toString().contains("font-size")) {
-            KMessageBox::ButtonCode convert;
+            KMessageBox::ButtonCode convert = KMessageBox::Continue;
             QDomNodeList kproducerNodes = m_doc.elementsByTagName("kdenlive_producer");
             for (int i = 0; i < kproducerNodes.count() && convert != KMessageBox::No; ++i) {
                 QDomElement kproducer = kproducerNodes.at(i).toElement();