Dont leave dangling references between ScrollBar and other controls

gemrb · Mar 2, 2015 · a1e90d0 · a1e90d0
1 parent e38aa49
commit a1e90d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/gemrb/core/GUI/Control.cpp b/gemrb/core/GUI/Control.cpp
@@ -64,6 +64,7 @@ Control::Control(const Region& frame)
 
 Control::~Control()
 {
+	SetScrollBar(NULL);
 	if (InHandler) {
 		Log(ERROR, "Control", "Destroying control inside event handler, crash may occur!");
 	}

diff --git a/gemrb/core/GUI/ScrollBar.cpp b/gemrb/core/GUI/ScrollBar.cpp
@@ -57,6 +57,9 @@ ScrollBar::ScrollBar(const Region& frame, Sprite2D* images[IE_SCROLLBAR_IMAGE_CO
 
 ScrollBar::~ScrollBar(void)
 {
+	if (ta) {
+		ta->SetScrollBar(NULL);
+	}
 	for(int i=0; i < IE_SCROLLBAR_IMAGE_COUNT; i++) {
 		Sprite2D::FreeSprite(Frames[i]);
 	}