Merge pull request #7502 from livecodeian/bugfix-23044

livecodepanos · web-flow · commit b5cf07b7efb0 · 2021-06-30T11:57:50.000+03:00
[[ Bug 23044 ]] Fix crash when deleting current card in closeStack handler
diff --git a/docs/notes/bugfix-23044.md b/docs/notes/bugfix-23044.md
@@ -0,0 +1 @@
+# Fix crash when deleting the current card of a stack within its closeStack handler
diff --git a/engine/src/stack3.cpp b/engine/src/stack3.cpp
@@ -1490,8 +1490,8 @@ void MCStack::removecard(MCCard *cptr)
 	if (state & CS_IGNORE_CLOSE)
 	{
 		curcard = cptr->next();
-		cptr->remove
-		(cards);
+		cptr->close();
+		cptr->remove(cards);
 		if (cards == NULL)
 		{
 			cards = curcard = MCtemplatecard->clone(False, False);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix crash when deleting the current card of a stack within its closeStack handler`
Original file line number	Diff line number	Diff line change
`@@ -1490,8 +1490,8 @@ void MCStack::removecard(MCCard *cptr)`
`1490`	`1490`	`if (state & CS_IGNORE_CLOSE)`
`1491`	`1491`	`{`
`1492`	`1492`	`curcard = cptr->next();`
`1493`		`- cptr->remove`
`1494`		`- (cards);`
	`1493`	`+ cptr->close();`
	`1494`	`+ cptr->remove(cards);`
`1495`	`1495`	`if (cards == NULL)`
`1496`	`1496`	`{`
`1497`	`1497`	`cards = curcard = MCtemplatecard->clone(False, False);`