From ab3d85b0891741f70c906937331a99a9e9403e1d Mon Sep 17 00:00:00 2001
From: david-sway <54483158+david-sway@users.noreply.github.com>
Date: Tue, 18 Jan 2022 11:00:58 -0500
Subject: [PATCH] Made changes to prevent two settings-scenarios that brick the
 app.

---
 mRemoteNG/UI/Tabs/TabHelper.cs              | 5 +++--
 mRemoteNG/UI/Window/ConnectionTreeWindow.cs | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mRemoteNG/UI/Tabs/TabHelper.cs b/mRemoteNG/UI/Tabs/TabHelper.cs
index 62e102d86..5caef75f1 100644
--- a/mRemoteNG/UI/Tabs/TabHelper.cs
+++ b/mRemoteNG/UI/Tabs/TabHelper.cs
@@ -48,8 +48,9 @@ namespace mRemoteNG.UI.Tabs
             set
             {
                 currentPanel = value;
-                Runtime.MessageCollector.AddMessage(Messages.MessageClass.DebugMsg,
-                                                    "Panel got focused: " + currentPanel.TabText);
+                //Disabled due to interaction with popups that would show this information and cause a softlock
+                //Runtime.MessageCollector.AddMessage(Messages.MessageClass.DebugMsg,
+                //                                    "Panel got focused: " + currentPanel.TabText);
             }
         }
     }
diff --git a/mRemoteNG/UI/Window/ConnectionTreeWindow.cs b/mRemoteNG/UI/Window/ConnectionTreeWindow.cs
index 3a5e44361..93fc29eca 100644
--- a/mRemoteNG/UI/Window/ConnectionTreeWindow.cs
+++ b/mRemoteNG/UI/Window/ConnectionTreeWindow.cs
@@ -141,7 +141,7 @@ namespace mRemoteNG.UI.Window
                 new RootNodeExpander()
             };
 
-            if (Settings.Default.OpenConsFromLastSession && !Settings.Default.NoReconnect)
+            if (Settings.Default.OpenConsFromLastSession && !Settings.Default.NoReconnect && !Settings.Default.AlwaysShowPanelSelectionDlg)
                 actions.Add(new PreviousSessionOpener(Runtime.ConnectionInitiator));
 
             ConnectionTree.PostSetupActions = actions;