aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/e-cal-model.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 5ad7c522b4..e3e41de86f 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-26 JP Rosevear <jpr@ximian.com>
+
+ * gui/e-cal-model.c (update_e_cal_view_for_client): guard against
+ the case that we redo queries while still waiting for a client to
+ open
+
2004-03-26 JP Rosevear <jpr@ximian.com>
Fixes #53134
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 1e8acf3334..da375d00e9 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1309,6 +1309,10 @@ update_e_cal_view_for_client (ECalModel *model, ECalModelClient *client_data)
priv = model->priv;
+ /* Skip if this client has not finished loading yet */
+ if (e_cal_get_load_state (client_data->client) != E_CAL_LOAD_LOADED)
+ return;
+
/* free the previous query, if any */
if (client_data->query) {
g_signal_handlers_disconnect_matched (client_data->query, G_SIGNAL_MATCH_DATA,