diff options
| author | Mateu Batle <mateu.batle@collabora.co.uk> | 2011-05-17 19:12:00 -0500 |
|---|---|---|
| committer | Mateu Batle <mateu.batle@collabora.co.uk> | 2011-05-17 19:12:00 -0500 |
| commit | bb2c09fdc563f7ce3212d7c011a7a067467bb3ce (patch) | |
| tree | 063c81600f2a9f51cae1841a393713c3d9578fcd | |
| parent | 5b81cb89f364c1d62e8ef8760009e6a1190feb09 (diff) | |
| parent | 50021992701be78acbb4495d612a2e763b0ea5b5 (diff) | |
Merge branch 'crash'
Reviewed by: Andre Moreira Magalhaes <andre.magalhaes@collabora.co.uk>
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | TelepathyQt4Yell/Farstream/channel.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -7,7 +7,7 @@ Enhancements: * ... Fixes: - * ... + * Fix crash when g_async_initable_new_finish returned error telepathy-qt4-yell 0.1.4 (2011-05-04) ====================================== diff --git a/TelepathyQt4Yell/Farstream/channel.cpp b/TelepathyQt4Yell/Farstream/channel.cpp index e78dd36..27a3f15 100644 --- a/TelepathyQt4Yell/Farstream/channel.cpp +++ b/TelepathyQt4Yell/Farstream/channel.cpp @@ -127,8 +127,8 @@ void PendingTfChannel::Private::onTfChannelNewFinish(GObject *sourceObject, G_ASYNC_INITABLE(sourceObject), res, &error)); if (error) { qDebug() << "PendingTfChannel::Private::onTfChannelNewFinish: error " << error->message; - g_clear_error(&error); self->setFinishedWithError(TP_QT4_ERROR_NOT_AVAILABLE, QLatin1String(error->message)); + g_clear_error(&error); return; } |