From 3808c980a016876fef80bff579868c6fe5e0d893 Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Wed, 2 Feb 2011 08:12:01 +0000 Subject: [PATCH] Fix bugs when default profile does not match current/last profile. It introduced various fps- and duration-related problems. Also, the geometry widget would sometimes have the wrong size. This was particularly obvious when starting a new session where the last session does not match the default project profile. svn path=/trunk/kdenlive/; revision=5377 --- src/kdenlivedoc.cpp | 2 +- src/mainwindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index d1a340b8..1ce567cb 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -726,7 +726,7 @@ bool KdenliveDoc::setProfilePath(QString path) if (path.isEmpty()) path = KdenliveSettings::default_profile(); if (path.isEmpty()) path = "dv_pal"; m_profile = ProfilesDialog::getVideoProfile(path); - bool current_fps = m_fps; + double current_fps = m_fps; if (m_profile.path.isEmpty()) { // Profile not found, use embedded profile QDomElement profileInfo = m_document.elementsByTagName("profileinfo").at(0).toElement(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index bbfaa6e3..66d52156 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -156,6 +156,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & if (!KdenliveSettings::colortheme().isEmpty()) slotChangePalette(NULL, KdenliveSettings::colortheme()); setFont(KGlobalSettings::toolBarFont()); parseProfiles(MltPath); + KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile()); m_commandStack = new QUndoGroup; setDockNestingEnabled(true); m_timelineArea = new KTabWidget(this); @@ -373,7 +374,6 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & setCentralWidget(m_timelineArea); - KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile()); m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)), actionCollection()); readOptions(); m_fileRevert = KStandardAction::revert(this, SLOT(slotRevert()), actionCollection()); -- 2.39.5