From 0cb4f364e3b72fe048aebcc5bb09cb3c2a91f594 Mon Sep 17 00:00:00 2001 From: Vibha Yadav Date: Wed, 1 Dec 2010 17:24:46 +0530 Subject: Bug #602183 (bnc) - Crash in Mini Calendar View Calendar view crashes on updating the scroll bar of newly created layout for events. Hence tries to access the event's canvas which is not yet drawn. Hence calling scroll bar update after drawing long events. --- calendar/gui/e-day-view.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'calendar') diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index f81afae485..ea2b13c2f7 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -4633,17 +4633,18 @@ e_day_view_check_layout (EDayView *day_view) day_view->days_shown, day_view->day_starts, &rows_in_top_display); - - if (day_view->rows_in_top_display != rows_in_top_display) { - day_view->rows_in_top_display = rows_in_top_display; - e_day_view_update_top_scroll (day_view, FALSE); - } } if (day_view->long_events_need_layout || day_view->long_events_need_reshape) e_day_view_reshape_long_events (day_view); + if (day_view->long_events_need_layout + && day_view->rows_in_top_display != rows_in_top_display) { + day_view->rows_in_top_display = rows_in_top_display; + e_day_view_update_top_scroll (day_view, FALSE); + } + day_view->long_events_need_layout = FALSE; day_view->long_events_need_reshape = FALSE; -- cgit