From 619f0fa5a0ce89b4345619a53d9d07d6d229c951 Mon Sep 17 00:00:00 2001
From: Robert Göffringmann
Date: Mon, 21 Nov 2005 18:21:44 +0000
Subject: fixed segmentation fault when speed/volume sliders are clicked and
 then dragged out of the scummvm window.

svn-id: r19683
---
 sky/control.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sky/control.cpp b/sky/control.cpp
index d94ba02cc6..b10809fda4 100644
--- a/sky/control.cpp
+++ b/sky/control.cpp
@@ -332,7 +332,8 @@ void Control::buttonControl(ConResource *pButton) {
 		return;
 	}
 	if (_curButtonText != pButton->_text) {
-		if (_textSprite) free(_textSprite);
+		if (_textSprite)
+			free(_textSprite);
 		_textSprite = NULL;
 		_curButtonText = pButton->_text;
 		if (pButton->_text) {
@@ -345,9 +346,11 @@ void Control::buttonControl(ConResource *pButton) {
 			}
 			_textSprite = (dataFileHeader *)textRes.textData;
 			_text->setSprite(_textSprite);
-		} else _text->setSprite(NULL);
+		} else
+			_text->setSprite(NULL);
 	}
-	_text->setXY(_mouseX + 12, _mouseY - 16);
+	int destY = (_mouseY - 16 >= 0) ? _mouseY - 16 : 0;
+	_text->setXY(_mouseX + 12, destY);
 }
 
 void Control::drawTextCross(uint32 flags) {
-- 
cgit v1.2.3