Merge pull request #4890 from dmitrio95/seq-crash

anatoly-os · web-flow · commit 75a6a85449b2 · 2019-04-10T17:55:07.000+02:00
fix #274614, fix #273783: fix crashes on stopping sequencer during soundfond loading
diff --git a/mscore/seq.cpp b/mscore/seq.cpp
@@ -345,7 +345,9 @@ void Seq::start()
 
 void Seq::stop()
       {
-      if (state == Transport::STOP)
+      const bool seqStopped = (state == Transport::STOP);
+      const bool driverStopped = !_driver || _driver->getState() == Transport::STOP;
+      if (seqStopped && driverStopped)
             return;
 
       if (oggInit) {

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,9 @@ void Seq::start()`
`345`	`345`
`346`	`346`	`void Seq::stop()`
`347`	`347`	`{`
`348`		`- if (state == Transport::STOP)`
	`348`	`+ const bool seqStopped = (state == Transport::STOP);`
	`349`	`+ const bool driverStopped = !_driver \|\| _driver->getState() == Transport::STOP;`
	`350`	`+ if (seqStopped && driverStopped)`
`349`	`351`	`return;`
`350`	`352`
`351`	`353`	`if (oggInit) {`