From 6d460b98271312f806fadfa037b7ea082e862a24 Mon Sep 17 00:00:00 2001 From: Chris Beck Date: Wed, 5 Mar 2014 16:06:35 -0500 Subject: [PATCH] fix bug #21757 by fixing up bad commit eb9274bd4c78a5f9a86bc9e0bf748f701d81e6b1. the code to drop messages older than 5 should run inside the if block, in the scenario when there were previous message, not outside it (!) --- src/game_display.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/game_display.cpp b/src/game_display.cpp index ba7b1035b29..5bd9aee1c99 100644 --- a/src/game_display.cpp +++ b/src/game_display.cpp @@ -922,23 +922,23 @@ void game_display::send_notification(const std::string& /*owner*/, const std::st if (i != i_end) { i->message = message + "\n" + i->message; + int endl_pos = 0; + for (int ctr = 0; ctr < 5; ctr++) + endl_pos = i->message.find('\n', endl_pos); + + i->message = i->message.substr(0,endl_pos); + send_dbus_notification(connection, i->id, owner, i->message); return; + } else { + uint32_t id = send_dbus_notification(connection, 0, owner, message); + if (!id) return; + wnotify visual; + visual.id = id; + visual.owner = owner; + visual.message = message; + notifications.push_back(visual); } - - int endl_pos = 0; - for (int ctr = 0; ctr < 5; ctr++) - endl_pos = i->message.find('\n', endl_pos); - - i->message = i->message.substr(0,endl_pos); - - uint32_t id = send_dbus_notification(connection, 0, owner, message); - if (!id) return; - wnotify visual; - visual.id = id; - visual.owner = owner; - visual.message = message; - notifications.push_back(visual); #endif #ifdef HAVE_GROWL