try to do things in the right order

Author: profezzorn

display/layer_controller.h

@@ -402,6 +402,7 @@ class SCRReader : public BufferedFileReader {
   bool Play(Effect* f) {
     if (!*f) return false; // no files, do nothing
     PVLOG_VERBOSE << "SCR Playing " << f->GetName() << "\n";
+    wait_for_previous_open_to_complete();
     sound_time_ms_ = SaberBase::sound_length * 1000;
     file_.PlayInternal(f);
     delayed_open_ = true;
@@ -410,6 +411,7 @@ class SCRReader : public BufferedFileReader {
   }
 
   void Play(const char* filename) {
+    wait_for_previous_open_to_complete();
     sound_time_ms_ = SaberBase::sound_length * 1000;
     file_.PlayInternal(filename);
     delayed_open_ = true;
@@ -424,6 +426,12 @@ class SCRReader : public BufferedFileReader {
 
   bool IsActive() override { return active_ || delayed_open_; }
 protected:
+  void wait_for_previous_open_to_complete() {
+    while (delayed_open_ && !state_machine_.done()) {
+      loop();
+      check_open();
+    }
+  }
   void check_open() {
     if (delayed_open_ && state_machine_.done()) {
       active_ = true;

display/rgb565frame.h

@@ -649,7 +649,8 @@ class RGB565Frame : public SizedLayeredScreenControl<WIDTH, HEIGHT> {
 	    SLEEP_MICROS(next_frame_time_ - frame_end);
 	  }
 	}
-	lc_->LC_onStop();
+	while (!lc_->LC_done()) YIELD();
+	if (!layers[0].is_playing()) lc_->LC_onStop();
 	while (!lc_->LC_done()) YIELD();
       }