]> git.sesse.net Git - kdenlive/commitdiff
fix regression on mac with m_recMonitor
authorMarco Gittler <marco@gitma.de>
Mon, 27 Sep 2010 08:42:29 +0000 (08:42 +0000)
committerMarco Gittler <marco@gitma.de>
Mon, 27 Sep 2010 08:42:29 +0000 (08:42 +0000)
svn path=/trunk/kdenlive/; revision=4940

src/mainwindow.cpp

index bdc3b16c8465011a36b95a4472ac82bf22846684..10224477cfaf6c3703fb01461c75b1cd284c309b 100644 (file)
@@ -2089,7 +2089,9 @@ void MainWindow::slotEditProjectSettings()
     if (w->exec() == QDialog::Accepted) {
         QString profile = w->selectedProfile();
         m_activeDocument->setProjectFolder(w->selectedFolder());
+#ifndef   Q_WS_MAC
         m_recMonitor->slotUpdateCaptureFolder(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash));
+#endif
         if (m_renderWidget) m_renderWidget->setDocumentPath(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash));
         if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs()) slotSwitchVideoThumbs();
         if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs()) slotSwitchAudioThumbs();
@@ -2385,7 +2387,9 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
     m_activeDocument = doc;
     m_activeTimeline->updateProjectFps();
     m_activeDocument->checkProjectClips();
+#ifndef   Q_WS_MAC
     m_recMonitor->slotUpdateCaptureFolder(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash));
+#endif
     if (KdenliveSettings::dropbframes()) slotUpdatePreviewSettings();
     //Update the mouse position display so it will display in DF/NDF format by default based on the project setting.
     slotUpdateMousePosition(0);
@@ -2443,8 +2447,11 @@ void MainWindow::slotPreferences(int page, int option)
 
 void MainWindow::slotUpdateCaptureFolder()
 {
+
+#ifndef   Q_WS_MAC
     if (m_activeDocument) m_recMonitor->slotUpdateCaptureFolder(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash));
     else m_recMonitor->slotUpdateCaptureFolder(KdenliveSettings::defaultprojectfolder());
+#endif
 }
 
 void MainWindow::slotUpdatePreviewSettings()