From cda557b6fbb311c38e5badaae6cf6fc84c3fe905 Mon Sep 17 00:00:00 2001 From: Camilo Alvarez Date: Wed, 6 Feb 2019 17:53:05 -0500 Subject: [PATCH] Avoid null pointers when race conditions or faults are present in protocol closing Avoid some of the detected faults --- mRemoteV1/UI/Tabs/ConnectionTab.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mRemoteV1/UI/Tabs/ConnectionTab.cs b/mRemoteV1/UI/Tabs/ConnectionTab.cs index 1d0d2c398..b47e913ad 100644 --- a/mRemoteV1/UI/Tabs/ConnectionTab.cs +++ b/mRemoteV1/UI/Tabs/ConnectionTab.cs @@ -43,18 +43,18 @@ namespace mRemoteNG.UI.Tabs } else { - ((InterfaceControl)Tag).Protocol.Close(); + ((InterfaceControl)Tag)?.Protocol.Close(); } } else { // close without the confirmation prompt... - ((InterfaceControl)Tag).Protocol.Close(); + ((InterfaceControl)Tag)?.Protocol.Close(); } } else { - ((InterfaceControl)Tag).Protocol.Close(); + ((InterfaceControl)Tag)?.Protocol.Close(); } base.OnFormClosing(e); }