widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/bug1095022 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1095022 in widelands: "Division by zero in ui_basic/slider.cc"
  https://bugs.launchpad.net/widelands/+bug/1095022

For more details, see:
https://code.launchpad.net/~hjd/widelands/bug1095022/+merge/174621

Basically using the solution suggested by SirVer in the bug report. It makes sense, and scan-build is happy.
-- 
https://code.launchpad.net/~hjd/widelands/bug1095022/+merge/174621
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/bug1095022 into lp:widelands.

=== modified file 'src/ui_basic/slider.cc'
--- src/ui_basic/slider.cc	2013-02-09 23:18:23 +0000
+++ src/ui_basic/slider.cc	2013-07-14 16:17:29 +0000
@@ -607,6 +607,7 @@
 void DiscreteSlider::layout() {
 	uint32_t w = get_w();
 	uint32_t h = get_h();
+	assert(labels.size());
 	slider.set_pos(Point(w / (2 * labels.size()) - slider.m_cursor_size / 2, 0));
 	slider.set_size
 		(w - (w / labels.size()) + slider.m_cursor_size,