Correctly track active campaigns from a client

MegaMek · Mar 11, 2020 · e15d675 · e15d675
1 parent 34b1828
commit e15d675
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/MekHQ/src/mekhq/campaign/CampaignController.java b/MekHQ/src/mekhq/campaign/CampaignController.java
@@ -162,6 +162,12 @@ public void removeActiveCampaign(UUID id) {
         activeCampaigns.remove(id);
     }
 
+	public void setActiveCampaigns(Collection<UUID> campaignIds) {
+        // TODO: evaluate if we can make this atomic somehow.
+        activeCampaigns.clear();
+        campaignIds.forEach(id -> activeCampaigns.put(id, id));
+	}
+
     public boolean isCampaignActive(UUID id) {
         return Objects.equals(getHost(), id) || activeCampaigns.containsKey(id);
     }

diff --git a/MekHQ/src/mekhq/gui/CampaignGUI.java b/MekHQ/src/mekhq/gui/CampaignGUI.java
@@ -2583,7 +2583,7 @@ private void refreshOnlineStatus() {
         } else if (app.isRemote()) {
             lblOnline.setText(
                 String.format("<html><font color='green'><b>CONNECTED</b> (%d playing)</font></html>",
-                    getCampaignController().getActiveCampaigns().size() + 1 /*Host*/));
+                    getCampaignController().getActiveCampaigns().size()));
         } else {
             lblOnline.setVisible(false);
         }

diff --git a/MekHQ/src/mekhq/online/MekHQClient.java b/MekHQ/src/mekhq/online/MekHQClient.java
@@ -234,6 +234,8 @@ protected void handlePong(UUID id, Pong pong) {
                 dateFormatter.parseDateTime(campaign.getDate()), campaign.getLocation(), campaign.getIsGMMode());
         }
 
+        controller.setActiveCampaigns(foundCampaigns);
+
         MekHQ.triggerEvent(new CampaignListUpdatedEvent());
     }