diff --git a/src/dialogs/kdenlivesettingsdialog.cpp b/src/dialogs/kdenlivesettingsdialog.cpp
index 107f24e30875575cd9cdeeac137258c9dfd29410..4e76aa0aeed83050fb0a774c71b4504589d32d6a 100644
--- a/src/dialogs/kdenlivesettingsdialog.cpp
+++ b/src/dialogs/kdenlivesettingsdialog.cpp
@@ -1101,6 +1101,10 @@ void KdenliveSettingsDialog::updateSettings()
emit pCore->autoScrollChanged();
}
+ if (m_configTimeline.kcfg_pauseonseek->isChecked() != KdenliveSettings::pauseonseek()) {
+ KdenliveSettings::setPauseonseek(m_configTimeline.kcfg_pauseonseek->isChecked());
+ }
+
// Mimes
if (m_configEnv.kcfg_addedExtensions->text() != KdenliveSettings::addedExtensions()) {
// Update list
diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 74b805083375ee1a984c98c2dac2b6b0f15ea344..c3a01cdbfd7846732cdc17f4368e184882a3fede 100644
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -322,6 +322,11 @@
true
+
+
+ true
+
+
false
diff --git a/src/monitor/monitor.cpp b/src/monitor/monitor.cpp
index fcf29c551602d12585277e124c6737c3ea173586..926198c7f976153e3639c50f0e80462641617ea6 100644
--- a/src/monitor/monitor.cpp
+++ b/src/monitor/monitor.cpp
@@ -2301,7 +2301,9 @@ void Monitor::processSeek(int pos)
if (!slotActivateMonitor()) {
return;
}
- pause();
+ if (KdenliveSettings::pauseonseek()) {
+ pause();
+ }
m_glMonitor->requestSeek(pos);
emit m_monitorManager->cleanMixer();
}
diff --git a/src/monitor/monitor.h b/src/monitor/monitor.h
index 82153e2942f81e0512c39c597502e6be56d66231..8b793ec72332f1fd26679b3c70aa618f73d92c03 100644
--- a/src/monitor/monitor.h
+++ b/src/monitor/monitor.h
@@ -277,7 +277,7 @@ private slots:
void slotSeekPosition(int);
void addSnapPoint(int pos);
void removeSnapPoint(int pos);
- /** @brief Pause monitor and process seek */
+ /** @brief Process seek and optionally pause monitor */
void processSeek(int pos);
/** @brief Check and display dropped frames */
void checkDrops();
diff --git a/src/ui/configtimeline_ui.ui b/src/ui/configtimeline_ui.ui
index 60b18032adfa213fa2b54176c84d5ddf7f005910..e1fc3ff7f81763d08f84c5aa317b6b6fda3f23ef 100644
--- a/src/ui/configtimeline_ui.ui
+++ b/src/ui/configtimeline_ui.ui
@@ -11,7 +11,7 @@
- -
+
-
Raise properties pane when selecting in timeline
@@ -113,7 +113,7 @@
- -
+
-
Multi stream audio clips
@@ -168,7 +168,7 @@
- -
+
-
-
@@ -212,7 +212,14 @@
- -
+
-
+
+
+ Pause playback when seeking
+
+
+
+ -
Zoom using vertical drag in ruler