Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-153347: Send Ctrl-Alt-Del is available for non-running VMs (title edited)

Browse Source 
Reverted previous fix 7608caafd7, because
managed to find the root cause of this issue: commit ce3bec1231.
Instead of reverting the latter completely, this commit fixes the regression by removing unnecessary calling of UpdateButtons().

Note: The button will still be enabled for dom0 console.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
This commit is contained in:
Gabor Apati-Nagy 2015-05-26 11:45:55 +01:00
parent 87c3811b45
commit fd7407c127
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
XenAdmin/ConsoleView/VNCTabView.cs
View File

@ -198,7 +198,7 @@ namespace XenAdmin.ConsoleView
UpdateParentMinimumSize();
UpdateButtons();
UpdateTooltipOfToogleButton();
UpdateOpenSSHConsoleButtonState();
@ -1252,12 +1252,8 @@ namespace XenAdmin.ConsoleView
toggleConsoleButton.Text = vncScreen.UseVNC ? (CanEnableRDPOnCreamOrGreater(source.Connection) ? enableRDP : UseRDP) : UseStandardDesktop;
else
toggleConsoleButton.Text = vncScreen.UseSource ? UseXVNC : UseVNC;
if (Helpers.CreamOrGreater(source.Connection))
{
if (RDPEnabled || RDPControlEnabled)
tip.SetToolTip(this.toggleConsoleButton, null);
}
UpdateTooltipOfToogleButton();
scaleCheckBox.Visible = !rdp || vncScreen.UseVNC;
sendCAD.Enabled = !rdp || vncScreen.UseVNC;
@ -1271,6 +1267,14 @@ namespace XenAdmin.ConsoleView
scaleCheckBox_CheckedChanged(null, null); // make sure scale setting is now correct: CA-84324
}
private void UpdateTooltipOfToogleButton()
{
if (Helpers.CreamOrGreater(source.Connection))
{
if (RDPEnabled || RDPControlEnabled)
tip.SetToolTip(this.toggleConsoleButton, null);
}
}
private void TryToConnectRDP(object x)
{