]> git.sesse.net Git - kdenlive/commitdiff
Merge branch 'master' of git://anongit.kde.org/kdenlive
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Tue, 27 Nov 2012 21:51:10 +0000 (22:51 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Tue, 27 Nov 2012 21:51:10 +0000 (22:51 +0100)
1  2 
src/mainwindow.cpp

diff --combined src/mainwindow.cpp
index 355ebca77a84cc97eb1d1e6f5179cd69f0ca20d4,0a2491885d6a2c708418990e71cca3d4cc1eebab..d636135a70aafefdefe5a70125e0dd0e7d7c31f7
@@@ -676,6 -676,12 +676,12 @@@ MainWindow::~MainWindow(
      if (m_stopmotion) {
          delete m_stopmotion;
      }
+ #ifdef USE_JOGSHUTTLE
+     if (m_jogProcess)
+       delete m_jogProcess;
+ #endif
      m_effectStack->slotClipItemSelected(NULL);
      m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false);
  
@@@ -2063,7 -2069,7 +2069,7 @@@ void MainWindow::openLastFile(
          newFile(false);
          return;
      }
 -    QAction *firstUrlAction = m_fileOpenRecent->selectableActionGroup()->actions().first();
 +    QAction *firstUrlAction = m_fileOpenRecent->selectableActionGroup()->actions().last();
      if (firstUrlAction) firstUrlAction->trigger();
      else newFile(false);
  }