From 2272b5dbbded9afbe334f5458ccd27a3906a5120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 16 Aug 2007 19:03:45 +0000 Subject: [PATCH] actually don't send B_SILENT_RELAUNCH for any message in the initial message list git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21990 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/app/Roster.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/kits/app/Roster.cpp b/src/kits/app/Roster.cpp index 6ef7e37bde..9c664941b1 100644 --- a/src/kits/app/Roster.cpp +++ b/src/kits/app/Roster.cpp @@ -2378,14 +2378,12 @@ BRoster::_SendToRunning(team_id team, int argc, const char *const *args, BMessenger messenger; BMessenger::Private(messenger).SetTo(team, info.port, B_PREFERRED_TOKEN); - bool listContainsRefs = false; // send messages from the list if (messageList) { for (int32 i = 0; BMessage *message = (BMessage*)messageList->ItemAt(i); i++) { - listContainsRefs |= message->what == B_REFS_RECEIVED; messenger.SendMessage(message); } } @@ -2402,7 +2400,7 @@ BRoster::_SendToRunning(team_id team, int argc, const char *const *args, BMessage message(B_REFS_RECEIVED); message.AddRef("refs", ref); messenger.SendMessage(&message); - } else if (alreadyRunning && !listContainsRefs) + } else if (alreadyRunning && (!messageList || messageList->IsEmpty())) messenger.SendMessage(B_SILENT_RELAUNCH); // send B_READY_TO_RUN