Merge pull request #2133 from david-sway/v1.77.2-dev

Made changes to prevent two settings-scenarios that brick the app.
This commit is contained in:
Dimitrij
2022-01-18 16:14:43 +00:00
committed by GitHub
2 changed files with 4 additions and 3 deletions

View File

@@ -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);
}
}
}

View File

@@ -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;