Changeset 21987

Timestamp:

08/16/07 13:36:58 (15 months ago)

Author:

korli

Message:

Tracker seems to launch applications with a B_REFS_RECEIVED message in the initial message list.
Now checks if such a message is present and avoids sending B_SILENT_RELAUNCH in this case, and also in the standard case with a ref.
This fixes bug #1387

Files:

• haiku/trunk/src/kits/app/Roster.cpp (modified) (3 diffs)

haiku/trunk/src/kits/app/Roster.cpp

@@ -2379 +2379 @@
                 BMessenger::Private(messenger).SetTo(team, info.port,
                         B_PREFERRED_TOKEN);
+                bool listContainsRefs = false;
 
                 // send messages from the list
@@ -2385 +2386 @@
                                  BMessage *message = (BMessage*)messageList->ItemAt(i);
                                  i++) {
+                                listContainsRefs |= message->what == B_REFS_RECEIVED;
                                 messenger.SendMessage(message);
                         }
                 }
 
-                // send B_ARGV_RECEIVED or B_SILENT_RELAUNCH (if already running)
+                // send B_ARGV_RECEIVED or B_REFS_RECEIVED or B_SILENT_RELAUNCH (if already running)
                 if (args && argc > 1) {
                         BMessage message(B_ARGV_RECEIVED);
@@ -2396 +2398 @@
                                 message.AddString("argv", args[i]);
                         messenger.SendMessage(&message);
-                } else if (alreadyRunning)
-                        messenger.SendMessage(B_SILENT_RELAUNCH);
-
-                // send B_REFS_RECEIVED
-                if (ref) {
+                } else if (ref) { 
+                        printf("_SendToRunning : B_REFS_RECEIVED\n");
                         BMessage message(B_REFS_RECEIVED);
                         message.AddRef("refs", ref);
                         messenger.SendMessage(&message);
-                }
+                } else if (alreadyRunning && !listContainsRefs)
+                        messenger.SendMessage(B_SILENT_RELAUNCH);
 
                 // send B_READY_TO_RUN