[21662] Fix crash when setting group scrollbar to false while scrolling

livecodepanos · livecodepanos · commit 7c474117ad62 · 2018-10-31T09:16:32.000+02:00
diff --git a/docs/notes/bugfix-21662.md b/docs/notes/bugfix-21662.md
@@ -0,0 +1 @@
+# Fix crash when setting the scrollbar to false while scrolling
diff --git a/engine/src/control.cpp b/engine/src/control.cpp
@@ -1472,9 +1472,9 @@ Boolean MCControl::sbfocus(int2 x, int2 y, MCScrollbar *hsb, MCScrollbar *vsb)
 {
 	if (state & (CS_HSCROLL | CS_VSCROLL))
 	{
-		if (state & CS_HSCROLL)
+		if (state & CS_HSCROLL && hsb != nil)
 			hsb->mfocus(x, y);
-		else
+		else if (vsb != nil)
 			vsb->mfocus(x, y);
 		readscrollbars();
 		MCscreen->sync(getw());

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix crash when setting the scrollbar to false while scrolling`
Original file line number	Diff line number	Diff line change
`@@ -1472,9 +1472,9 @@ Boolean MCControl::sbfocus(int2 x, int2 y, MCScrollbar hsb, MCScrollbar vsb)`
`1472`	`1472`	`{`
`1473`	`1473`	`if (state & (CS_HSCROLL \| CS_VSCROLL))`
`1474`	`1474`	`{`
`1475`		`- if (state & CS_HSCROLL)`
	`1475`	`+ if (state & CS_HSCROLL && hsb != nil)`
`1476`	`1476`	`hsb->mfocus(x, y);`
`1477`		`- else`
	`1477`	`+ else if (vsb != nil)`
`1478`	`1478`	`vsb->mfocus(x, y);`
`1479`	`1479`	`readscrollbars();`
`1480`	`1480`	`MCscreen->sync(getw());`