Fixed possible null reference excepton

teo-nikolov · teo-nikolov · commit e39c4dbac4e4 · 2025-11-12T00:27:15.000+02:00
diff --git a/src/Bellatrix.Desktop/infrastructure/App.cs b/src/Bellatrix.Desktop/infrastructure/App.cs
@@ -170,14 +170,14 @@ public void AddElementEventHandler<TComponentsEventHandler>()
         where TComponentsEventHandler : ComponentEventHandlers
     {
         var elementEventHandler = (TComponentsEventHandler)Activator.CreateInstance(typeof(TComponentsEventHandler));
-        elementEventHandler.SubscribeToAll();
+        elementEventHandler?.SubscribeToAll();
     }
 
     public void RemoveElementEventHandler<TComponentsEventHandler>()
         where TComponentsEventHandler : ComponentEventHandlers
     {
         var elementEventHandler = (TComponentsEventHandler)Activator.CreateInstance(typeof(TComponentsEventHandler));
-        elementEventHandler.UnsubscribeToAll();
+        elementEventHandler?.UnsubscribeToAll();
     }
 
     public void AddPlugin<TExecutionExtension>()

Original file line number	Diff line number	Diff line change
`@@ -170,14 +170,14 @@ public void AddElementEventHandler<TComponentsEventHandler>()`
`170`	`170`	`where TComponentsEventHandler : ComponentEventHandlers`
`171`	`171`	`{`
`172`	`172`	`var elementEventHandler = (TComponentsEventHandler)Activator.CreateInstance(typeof(TComponentsEventHandler));`
`173`		`- elementEventHandler.SubscribeToAll();`
	`173`	`+ elementEventHandler?.SubscribeToAll();`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`public void RemoveElementEventHandler<TComponentsEventHandler>()`
`177`	`177`	`where TComponentsEventHandler : ComponentEventHandlers`
`178`	`178`	`{`
`179`	`179`	`var elementEventHandler = (TComponentsEventHandler)Activator.CreateInstance(typeof(TComponentsEventHandler));`
`180`		`- elementEventHandler.UnsubscribeToAll();`
	`180`	`+ elementEventHandler?.UnsubscribeToAll();`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`public void AddPlugin<TExecutionExtension>()`