diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-18 19:23:52 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-19 14:26:04 +0100 |
| commit | 3dcc0f4ebb90b80c8ee39794a65e906013d692a5 (patch) | |
| tree | 15e82b768efb87dc192de1f429a0875decee131c | |
| parent | af998be5e6638671d05097176c7405258b30e315 (diff) | |
| download | telepathy-mission-control-3dcc0f4ebb90b80c8ee39794a65e906013d692a5.tar.gz | |
mcd_account_self_contact_upgraded_cb: don't crash on bad timing
If the account is disconnecting, we might get the callback for
upgrading after we've already NULLed out self->priv->self_contact.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69542
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
| -rw-r--r-- | src/mcd-account.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mcd-account.c b/src/mcd-account.c index 52bad978..fb03638e 100644 --- a/src/mcd-account.c +++ b/src/mcd-account.c @@ -4925,6 +4925,11 @@ mcd_account_self_contact_upgraded_cb (GObject *source_object, tp_contact_get_presence_message (self_contact), self_contact); } + else if (self->priv->self_contact == NULL) + { + DEBUG ("self-contact '%s' has disappeared since we asked to " + "upgrade it", tp_contact_get_identifier (self_contact)); + } else { DEBUG ("self-contact '%s' has changed to '%s' since we asked to " |