From ed245b42cb29244f7abec9e9ea16ac34315b03b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Sat, 18 Feb 2017 10:43:14 +0100 Subject: [PATCH] scrolledwindow: Avoid usage of uninitialized local the scrollbar passed in better be either priv->hscrollbar or priv->vscrollbar. Ensure that by using a simple else instead of an else-if and a g_assert. --- gtk/gtkscrolledwindow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index bc23a13f78..d2c3cbfb2f 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -3188,8 +3188,10 @@ gtk_scrolled_window_allocate_scrollbar (GtkScrolledWindow *scrolled_window, child_allocation.width = content_allocation.width; child_allocation.height = sb_height; } - else if (scrollbar == priv->vscrollbar) + else { + g_assert (scrollbar == priv->vscrollbar); + if ((_gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL && (priv->window_placement == GTK_CORNER_TOP_RIGHT || priv->window_placement == GTK_CORNER_BOTTOM_RIGHT)) ||