Ticket #3222: t3222_handle_notifications_v2.patch

binaries/data/mods/public/gui/session/messages.js

@@ -136 +136 @@
 };
 
 // Notifications
 function handleNotifications()
 {
-    var notification = Engine.GuiInterfaceCall("GetNextNotification");
-
-    if (!notification)
-        return;
-    if (!notification.type)
-    {
-        error("notification without type found.\n"+uneval(notification))
-        return;
-    }
-    if (!notification.players)
+    var notification;
+    while((notification = Engine.GuiInterfaceCall("GetNextNotification")))
     {
-        error("notification without players found.\n"+uneval(notification))
-        return;
+        
+        if (!notification.type)
+        {
+            error("Notification without type found.\n"+uneval(notification))
+            continue;
+        }
+        
+        if (!notification.players)
+        {
+            error("Notification without players found.\n"+uneval(notification))
+            continue;
+        }
+        
+        var action = g_NotificationsTypes[notification.type];
+        if (!action)
+        {
+            error("Unknown notification type '" + notification.type + "' found.");
+            continue;
+        }
+        
+        for (var player of notification.players)
+            action(notification, player);
     }
-    var action = g_NotificationsTypes[notification.type];
-    if (!action)
-    {
-        error("unknown notification type '" + notification.type + "' found.");
-        return;
-    }
-
-    for (var player of notification.players)
-        action(notification, player);
 }
 
 function updateDiplomacy()
 {
     g_Players = getPlayerData(g_PlayerAssignments);

binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -735 +735 @@
 };
 
 GuiInterface.prototype.GetNextNotification = function()
 {
     if (this.notifications.length)
-        return this.notifications.pop();
+        return this.notifications.shift();
     else
         return false;
 };
 
 GuiInterface.prototype.GetAvailableFormations = function(player, wantedPlayer)