Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-04-04 18:58:15 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-04-04 18:58:15 (GMT) |
| commit | fb9708cbb37e0454196f262a75122f986fffa62e (patch) | |
| tree | 60286c184fd4dfe15031bccd805404980bf958ff /Sluift/sluift.cpp | |
| parent | 9b68e3ba79bc581c950003b9a4dec0183b665884 (diff) | |
| download | swift-fb9708cbb37e0454196f262a75122f986fffa62e.zip swift-fb9708cbb37e0454196f262a75122f986fffa62e.tar.bz2 | |
Fixed assertion failure in Sluift.
Diffstat (limited to 'Sluift/sluift.cpp')
| -rw-r--r-- | Sluift/sluift.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Sluift/sluift.cpp b/Sluift/sluift.cpp index 0545089..49cfec4 100644 --- a/Sluift/sluift.cpp +++ b/Sluift/sluift.cpp @@ -137,11 +137,14 @@ class SluiftClient { if (watchdog.getTimedOut() || !client->isActive()) { return Stanza::ref(); } - else { + else if (!pendingEvents.empty()) { Stanza::ref event = pendingEvents.front(); pendingEvents.pop_front(); return event; } + else { + return Stanza::ref(); + } } std::vector<XMPPRosterItem> getRoster() { |