[Scummvm-cvs-logs] scummvm master -> 6a2522a1423b23ef14dbc5e317befd4f3a800020

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6a2522a142 GRAPHICS: Crash fix for bug #3466536 ("Assertion on MIDI gain slider").


Commit: 6a2522a1423b23ef14dbc5e317befd4f3a800020
    https://github.com/scummvm/scummvm/commit/6a2522a1423b23ef14dbc5e317befd4f3a800020
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-28T22:32:09-08:00

Commit Message:
GRAPHICS: Crash fix for bug #3466536 ("Assertion on MIDI gain slider").

This fixes the crash, but the Midi Gain slider (and probably any other
slider bar in modern theme) still distorts the left corner shape when
the slider thumb is at very small values...

Changed paths:
    graphics/VectorRendererSpec.cpp



diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp
index b5dc129..ce363d3 100644
--- a/graphics/VectorRendererSpec.cpp
+++ b/graphics/VectorRendererSpec.cpp
@@ -665,6 +665,9 @@ drawRoundedSquare(int x, int y, int r, int w, int h) {
 	if ((r * 2) > w || (r * 2) > h)
 		r = MIN(w /2, h / 2);
 
+	if (r <= 0)
+		return;
+
 	if (Base::_fillMode != kFillDisabled && Base::_shadowOffset
 		&& x + w + Base::_shadowOffset + 1 < Base::_activeSurface->w
 		&& y + h + Base::_shadowOffset + 1 < Base::_activeSurface->h) {