From 703178ddf19d5d74b4f293e9d17fc3b07280158f Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Wed, 19 Apr 2017 12:37:56 -0400 Subject: [PATCH] Fix NPE when importing from the connection tree Fixes #518 --- mRemoteV1/UI/Controls/ConnectionContextMenu.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mRemoteV1/UI/Controls/ConnectionContextMenu.cs b/mRemoteV1/UI/Controls/ConnectionContextMenu.cs index 9ff0f1457..fd51d65c2 100644 --- a/mRemoteV1/UI/Controls/ConnectionContextMenu.cs +++ b/mRemoteV1/UI/Controls/ConnectionContextMenu.cs @@ -717,7 +717,11 @@ namespace mRemoteNG.UI.Controls private void OnImportFileClicked(object sender, EventArgs e) { - var selectedNodeAsContainer = _connectionTree.SelectedNode as ContainerInfo ?? _connectionTree.SelectedNode.Parent; + ContainerInfo selectedNodeAsContainer; + if (_connectionTree.SelectedNode == null) + selectedNodeAsContainer = Runtime.ConnectionTreeModel.RootNodes.First(); + else + selectedNodeAsContainer = _connectionTree.SelectedNode as ContainerInfo ?? _connectionTree.SelectedNode.Parent; Import.ImportFromFile(selectedNodeAsContainer); }