aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/e-week-view.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index cd619ce7e8..a98321eab7 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-02 JP Rosevear <jpr@ximian.com>
+
+ * gui/e-week-view.c (free_view_popup): only discard the popup if
+ we created one
+
2002-05-02 Rodrigo Moya <rodrigo@ximian.com>
* pcs/query.c: refactored a bit, to not do things in idle loops.
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index c01230cbf2..f0913e3e28 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -3498,8 +3498,12 @@ static void
free_view_popup (GtkWidget *widget, gpointer data)
{
EWeekView *week_view = E_WEEK_VIEW (data);
+
+ if (week_view->view_menu == NULL)
+ return;
gnome_calendar_discard_view_popup (week_view->calendar, week_view->view_menu);
+ week_view->view_menu = NULL;
}
void