Skip to content

Commit 62eaa70

Browse files
authored
Merge pull request #606 from OpenVicProject/bugfix_truncate_after_math_in_slider
Bugfix: divide by zero in GUIScrollbar::set_gui_scrollbar
2 parents bf29677 + 218e17b commit 62eaa70

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

extension/src/openvic-extension/classes/GUIScrollbar.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "GUIScrollbar.hpp"
22

3+
#include <cassert>
34
#include <cstdint>
45

56
#include <godot_cpp/classes/global_constants.hpp>
@@ -433,10 +434,13 @@ Error GUIScrollbar::set_gui_scrollbar(GUI::Scrollbar const* new_gui_scrollbar) {
433434
_calculate_rects();
434435

435436
auto adjust_for_min_and_step_size = [
436-
min_value = gui_scrollbar->get_min_value().truncate<int32_t>(),
437-
step_size = gui_scrollbar->get_step_size().truncate<int32_t>()
437+
min_value = gui_scrollbar->get_min_value(),
438+
step_size = gui_scrollbar->get_step_size()
438439
](const int32_t val)->int32_t {
439-
return (val - min_value) / step_size;
440+
assert(step_size != 0);
441+
return (
442+
(val - min_value) / step_size
443+
).truncate<int32_t>();
440444
};
441445

442446
const bool was_blocking_signals = is_blocking_signals();

0 commit comments

Comments
 (0)