merged with master

2019-03-25 12:43:23 +11:00
parent e2c5c87a0a a3c1342f77
commit 93c009c7fd
83 changed files with 7823 additions and 1469 deletions
@@ -569,6 +569,9 @@ void ExportDialog::StartExport() {
    connect(export_thread_, SIGNAL(ProgressChanged(int, qint64)), this, SLOT(update_progress_bar(int, qint64)));
    connect(renderCancel, SIGNAL(clicked(bool)), export_thread_, SLOT(Interrupt()));

+    // Close all effects in effect controls (prevents UI threading issues)
+    panel_effect_controls->Clear();
+
    // Close all currently open clips
    close_active_clips(olive::ActiveSequence.get());