Merge branch 'master' of https://github.com/olive-editor/olive into furtherocio

2019-03-18 16:02:27 +11:00
parent 60302178a5 6d01597650
commit 492492f7cd
1 changed files with 7 additions and 3 deletions
@@ -606,10 +606,14 @@ void EffectControls::SetClips()
 {
  Clear(true);

-  // replace clip vector
-  selected_clips_ = olive::ActiveSequence->SelectedClips(false);
+  if (olive::ActiveSequence == nullptr) {
+    selected_clips_.clear();
+  } else {
+    // replace clip vector
+    selected_clips_ = olive::ActiveSequence->SelectedClips(false);

-  Load();
+    Load();
+  }
 }

 void EffectControls::Load() {