Ticket #1918: garrisonBug.diff

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

@@ -59 +59 @@
                 continue;
 
             var templateName = entState.template;
-            // Special handling for garrisoned units
-            if (templateName && templateName.indexOf("&") != -1)
-                var key = templateName;
-            else
-                var key = GetTemplateData(templateName).selectionGroupName || templateName;
+            var template = GetTemplateData(templateName);
+            var key = template.selectionGroupName || templateName;
 
+            // Garrisoned units have an extended template
+            var index = templateName.indexOf("&");
+            if (index != -1 && key.indexOf("&") == -1)
+                key = templateName.slice(0, index+1) + key;
+
             if (this.groups[key])
                 this.groups[key] += 1;
             else