From kde-commits  Fri Jan 06 11:21:22 2017
From: Jean-Baptiste Mardelle <null () kde ! org>
Date: Fri, 06 Jan 2017 11:21:22 +0000
To: kde-commits
Subject: [kdenlive] src: Merge branch '16.12'
Message-Id: <E1cPSaI-00032d-QG () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=148370169114096

Git commit 58d0fec87925ca5586d69c8d9ff58cff270b6bb0 by Jean-Baptiste Mardel=
le.
Committed on 06/01/2017 at 11:21.
Pushed by mardelle into branch 'master'.

Merge branch '16.12'

M  +2    -2    src/doc/kdenlivedoc.cpp
M  +7    -4    src/mainwindow.cpp
M  +4    -1    src/project/dialogs/archivewidget.cpp

https://commits.kde.org/kdenlive/58d0fec87925ca5586d69c8d9ff58cff270b6bb0

diff --cc src/doc/kdenlivedoc.cpp
index 5f01941e7,fbd1bdc5b..b1685daeb
--- a/src/doc/kdenlivedoc.cpp
+++ b/src/doc/kdenlivedoc.cpp
@@@ -561,10 -559,10 +561,10 @@@ void KdenliveDoc::slotAutoSave(
      if (m_render && m_autosave) {
          if (!m_autosave->isOpen() && !m_autosave->open(QIODevice::ReadWri=
te)) {
              // show error: could not open the autosave file
 -            qDebug() << "ERROR; CANNOT CREATE AUTOSAVE FILE";
 +            qCDebug(KDENLIVE_LOG) << "ERROR; CANNOT CREATE AUTOSAVE FILE";
          }
 -        //qDebug() << "// AUTOSAVE FILE: " << m_autosave->fileName();
 +        //qCDebug(KDENLIVE_LOG) << "// AUTOSAVE FILE: " << m_autosave->fi=
leName();
-         QDomDocument sceneList =3D xmlSceneList(m_render->sceneList(m_url=
.adjusted(QUrl::RemoveFilename).toLocalFile()));
+         QDomDocument sceneList =3D xmlSceneList(m_render->sceneList(m_url=
.adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash).toLocalFile()));
          if (sceneList.isNull()) {
              //Make sure we don't save if scenelist is corrupted
              KMessageBox::error(QApplication::activeWindow(), i18n("Cannot=
 write to file %1, scene list is corrupted.", m_autosave->fileName()));
diff --cc src/mainwindow.cpp
index 2a104a27a,dbed6db14..e16056214
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@@ -3761,10 -3648,10 +3764,10 @@@ void MainWindow::slotUpdateProxySetting
  =

  void MainWindow::slotArchiveProject()
  {
 -    QList <ClipController*> list =3D pCore->binController()->getControlle=
rList();
 +    QList<ClipController *> list =3D pCore->binController()->getControlle=
rList();
      KdenliveDoc *doc =3D pCore->projectManager()->current();
      pCore->binController()->saveDocumentProperties(pCore->projectManager(=
)->currentTimeline()->documentProperties(), doc->metadata(), pCore->project=
Manager()->currentTimeline()->projectView()->guidesData());
-     QDomDocument xmlDoc =3D doc->xmlSceneList(m_projectMonitor->sceneList=
(doc->url().adjusted(QUrl::RemoveFilename).path()));
+     QDomDocument xmlDoc =3D doc->xmlSceneList(m_projectMonitor->sceneList=
(doc->url().adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash).toLoc=
alFile()));
      QPointer<ArchiveWidget> d =3D new ArchiveWidget(doc->url().fileName()=
, xmlDoc, list, pCore->projectManager()->currentTimeline()->projectView()->=
extractTransitionsLumas(), this);
      if (d->exec()) {
          m_messageLabel->setMessage(i18n("Archiving project"), OperationCo=
mpletedMessage);