Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

actually don't send B_SILENT_RELAUNCH for any message in the initial message list

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21990 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2007-08-16 19:03:45 +00:00
parent 0b70ea5992
commit 2272b5dbbd
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/kits/app/Roster.cpp
View File

@ -2378,14 +2378,12 @@ BRoster::_SendToRunning(team_id team, int argc, const char *const *args,
BMessenger messenger; BMessenger messenger;
BMessenger::Private(messenger).SetTo(team, info.port, BMessenger::Private(messenger).SetTo(team, info.port,
B_PREFERRED_TOKEN); B_PREFERRED_TOKEN);
bool listContainsRefs = false;
// send messages from the list // send messages from the list
if (messageList) { if (messageList) {
for (int32 i = 0; for (int32 i = 0;
BMessage *message = (BMessage*)messageList->ItemAt(i); BMessage *message = (BMessage*)messageList->ItemAt(i);
i++) { i++) {
listContainsRefs |= message->what == B_REFS_RECEIVED;
messenger.SendMessage(message); messenger.SendMessage(message);
} }
} }
@ -2402,7 +2400,7 @@ BRoster::_SendToRunning(team_id team, int argc, const char *const *args,
BMessage message(B_REFS_RECEIVED); BMessage message(B_REFS_RECEIVED);
message.AddRef("refs", ref); message.AddRef("refs", ref);
messenger.SendMessage(&message); messenger.SendMessage(&message);
} else if (alreadyRunning && !listContainsRefs) } else if (alreadyRunning && (!messageList || messageList->IsEmpty()))
messenger.SendMessage(B_SILENT_RELAUNCH); messenger.SendMessage(B_SILENT_RELAUNCH);
// send B_READY_TO_RUN // send B_READY_TO_RUN