Fix crash on clip deletion, fix issues with placeholder clips

[kdenlive] / src / kdenlivesettingsdialog.cpp

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index ff01bba2823e1d299f782a0f0d15609483e13548..5744bcdd44aec11e8a171f9bfa16ea66227ee5cc 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -75,6 +75,11 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent) :
     m_configCapture.setupUi(p4);
     m_page4 = addPage(p4, i18n("Capture"), "media-record");
     m_configCapture.tabWidget->setCurrentIndex(KdenliveSettings::defaultcapture());
+#ifdef Q_WS_MAC
+    m_configCapture.tabWidget->setEnabled(false);
+    m_configCapture.kcfg_defaultcapture->setEnabled(false);
+    m_configCapture.label->setText(i18n("Capture is not yet available on OS X."));
+#endif
 
     QWidget *p5 = new QWidget;
     m_configShuttle.setupUi(p5);
@@ -411,13 +416,25 @@ void KdenliveSettingsDialog::updateSettings()
     KdenliveSettings::setDefault_profile(m_defaultPath);
 
     bool resetProfile = false;
+    bool updateCapturePath = false;
 
     if (m_configEnv.capturefolderurl->url().path() != KdenliveSettings::capturefolder()) {
-        kDebug() << "/// CAPT FOLDER UPDATED";
         KdenliveSettings::setCapturefolder(m_configEnv.capturefolderurl->url().path());
-        emit updateCaptureFolder();
+        updateCapturePath = true;
+    }
+
+    if (m_configCapture.kcfg_dvgrabfilename->text() != KdenliveSettings::dvgrabfilename()) {
+        KdenliveSettings::setDvgrabfilename(m_configCapture.kcfg_dvgrabfilename->text());
+        updateCapturePath = true;
     }
 
+    if ((uint) m_configCapture.kcfg_firewireformat->currentIndex() != KdenliveSettings::firewireformat()) {
+        KdenliveSettings::setFirewireformat(m_configCapture.kcfg_firewireformat->currentIndex());
+        updateCapturePath = true;
+    }
+
+    if (updateCapturePath) emit updateCaptureFolder();
+
     QString value = m_configCapture.kcfg_rmd_alsa_device->itemData(m_configCapture.kcfg_rmd_alsa_device->currentIndex()).toString();
     if (value != KdenliveSettings::rmd_alsadevicename()) {
         KdenliveSettings::setRmd_alsadevicename(value);