[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive] src: Merge branch '16.12'
From:       Jean-Baptiste Mardelle <null () kde ! org>
Date:       2017-01-02 13:06:44
Message-ID: E1cO2K4-0006Oq-C9 () code ! kde ! org
[Download RAW message or body]

Git commit 89016de081a58e540ccd1dbd6072cc7ceccee661 by Jean-Baptiste Mardelle.
Committed on 02/01/2017 at 13:06.
Pushed by mardelle into branch 'master'.

Merge branch '16.12'

M  +3    -3    src/doc/kdenlivedoc.cpp
M  +1    -1    src/mainwindow.cpp
M  +1    -0    src/project/dialogs/temporarydata.cpp
M  +1    -1    src/timeline/managers/previewmanager.cpp

https://commits.kde.org/kdenlive/89016de081a58e540ccd1dbd6072cc7ceccee661

diff --cc src/doc/kdenlivedoc.cpp
index 5c901f6ee,cc1af3f0b..cc710ea64
--- a/src/doc/kdenlivedoc.cpp
+++ b/src/doc/kdenlivedoc.cpp
@@@ -294,10 -296,10 +294,10 @@@ KdenliveDoc::~KdenliveDoc(
          // Document was never saved, delete cache folder
          QString documentId = QDir::cleanPath(getDocumentProperty(QStringLiteral("documentid")));
          bool ok;
-         documentId.toLong(&ok);
+         documentId.toLongLong(&ok, 10);
          if (ok && !documentId.isEmpty()) {
              QDir baseCache = getCacheDir(CacheBase, &ok);
 -            if (baseCache.dirName() == documentId && baseCache.entryList(QDir::Files).count() == 0) {
 +            if (baseCache.dirName() == documentId && baseCache.entryList(QDir::Files).isEmpty()) {
                  baseCache.removeRecursively();
              }
          }
[prev in list] [next in list] [prev in thread] [next in thread]