[[ Bug 13428 ]] Play stop not called in livecode 7

runrevali · runrevali · commit 940ed3e14382 · 2014-09-12T16:51:41.000+01:00
diff --git a/docs/notes/bugfix-13428.md b/docs/notes/bugfix-13428.md
@@ -0,0 +1 @@
+# Play stop not working
diff --git a/engine/src/cmdse.cpp b/engine/src/cmdse.cpp
@@ -2255,8 +2255,13 @@ void MCMM::exec_ctxt(MCExecContext &ctxt)
 			else
 				MCMultimediaExecPlayLastVideoOperation(ctxt, PP_UNDEFINED);
 		}
+        // AL-2014-09-12: [[ Bug 13428 ]] The only valid audio action without a clip is stop
+        else if (audio)
+        {
+            MCMultimediaExecStopPlaying(ctxt);
+        }
 	}
-	else 
+	else
 	{
 		MCObject *optr = nil;
 		if (stack != NULL)
diff --git a/engine/src/exec-multimedia.cpp b/engine/src/exec-multimedia.cpp
@@ -303,6 +303,7 @@ void MCMultimediaExecStopPlaying(MCExecContext& ctxt)
 {
 	MCU_play_stop();
 }
+
 void MCMultimediaExecStopPlayingObject(MCExecContext& ctxt, MCObject *p_object)
 {
 	if (p_object->gettype() == CT_PLAYER)
@@ -580,6 +581,9 @@ void MCMultimediaExecPrepareVideoClip(MCExecContext& ctxt, MCStack *p_target, in
 
 void MCMultimediaExecPlayAudioClip(MCExecContext& ctxt, MCStack *p_target, int p_chunk_type, MCStringRef p_clip, bool p_looping)
 {
+    // AL-2014-09-12: [[ Bug 13428 ]] Missed an MCU_play_stop() in the refactoring
+    MCU_play_stop();
+    
 	MCStack *sptr;
 	sptr = p_target != nil ? p_target : MCdefaultstackptr;
 

Original file line number	Diff line number	Diff line change
`@@ -2255,8 +2255,13 @@ void MCMM::exec_ctxt(MCExecContext &ctxt)`
`2255`	`2255`	`else`
`2256`	`2256`	`MCMultimediaExecPlayLastVideoOperation(ctxt, PP_UNDEFINED);`
`2257`	`2257`	`}`
	`2258`	`+ // AL-2014-09-12: [[ Bug 13428 ]] The only valid audio action without a clip is stop`
	`2259`	`+ else if (audio)`
	`2260`	`+ {`
	`2261`	`+ MCMultimediaExecStopPlaying(ctxt);`
	`2262`	`+ }`
`2258`	`2263`	`}`
`2259`		`- else`
	`2264`	`+ else`
`2260`	`2265`	`{`
`2261`	`2266`	`MCObject *optr = nil;`
`2262`	`2267`	`if (stack != NULL)`
Original file line number	Diff line number	Diff line change
`@@ -303,6 +303,7 @@ void MCMultimediaExecStopPlaying(MCExecContext& ctxt)`
`303`	`303`	`{`
`304`	`304`	`MCU_play_stop();`
`305`	`305`	`}`
	`306`	`+`
`306`	`307`	`void MCMultimediaExecStopPlayingObject(MCExecContext& ctxt, MCObject *p_object)`
`307`	`308`	`{`
`308`	`309`	`if (p_object->gettype() == CT_PLAYER)`
`@@ -580,6 +581,9 @@ void MCMultimediaExecPrepareVideoClip(MCExecContext& ctxt, MCStack *p_target, in`
`580`	`581`
`581`	`582`	`void MCMultimediaExecPlayAudioClip(MCExecContext& ctxt, MCStack *p_target, int p_chunk_type, MCStringRef p_clip, bool p_looping)`
`582`	`583`	`{`
	`584`	`+ // AL-2014-09-12: [[ Bug 13428 ]] Missed an MCU_play_stop() in the refactoring`
	`585`	`+ MCU_play_stop();`
	`586`	`+`
`583`	`587`	`MCStack *sptr;`
`584`	`588`	`sptr = p_target != nil ? p_target : MCdefaultstackptr;`
`585`	`589`