From 19719ee1fba9aaea220746f858224ccb80d94256 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Tue, 1 Sep 2020 20:59:22 +0200
Subject: [PATCH] #2109: Skip id ranges with no events

---
 .../Rewrite/ConnectionIdRewritePass.cs            | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/ILSpy.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs b/ILSpy.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs
index 1baedd2a2..3618e490e 100644
--- a/ILSpy.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs
+++ b/ILSpy.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs
@@ -139,13 +139,17 @@ namespace ILSpy.BamlDecompiler.Rewrite
 			var block = function.Body.Children.OfType<Block>().First();
 			var ilSwitch = block.Descendants.OfType<SwitchInstruction>().FirstOrDefault();
 
+			var events = new List<EventRegistration>();
 			if (ilSwitch != null)
 			{
 				foreach (var section in ilSwitch.Sections)
 				{
-					var events = new List<EventRegistration>();
+					events.Clear();
 					FindEvents(section.Body, events);
-					result.Add((section.Labels, events.ToArray()));
+					if (events.Count > 0)
+					{
+						result.Add((section.Labels, events.ToArray()));
+					}
 				}
 			}
 			else
@@ -161,9 +165,12 @@ namespace ILSpy.BamlDecompiler.Rewrite
 					var inst = comp.Kind == ComparisonKind.Inequality
 						? ifInst.FalseInst
 						: ifInst.TrueInst;
-					var events = new List<EventRegistration>();
+					events.Clear();
 					FindEvents(inst, events);
-					result.Add((new LongSet(id), events.ToArray()));
+					if (events.Count > 0)
+					{
+						result.Add((new LongSet(id), events.ToArray()));
+					}
 				}
 			}
 		}