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

Fixed client crash when no hosts to connect

This commit is contained in:
MaxXor 2015-08-28 12:45:57 +02:00
parent e9fdb1a431
commit bbcc2f954e
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Client/Core/Helper/HostHelper.cs
View File

@ -2,7 +2,6 @@
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using xClient.Core.Data; using xClient.Core.Data;
using xClient.Core.Utilities;
namespace xClient.Core.Helper namespace xClient.Core.Helper
{ {

3
Client/Core/Helper/MutexHelper.cs
View File

@ -16,7 +16,10 @@ namespace xClient.Core.Helper
public static void CloseMutex() public static void CloseMutex()
{ {
if (_appMutex != null) if (_appMutex != null)
{
_appMutex.Close(); _appMutex.Close();
_appMutex = null;
}
} }
} }
} }

2
Client/Core/Utilities/HostsManager.cs
View File

@ -5,6 +5,8 @@ namespace xClient.Core.Utilities
{ {
public class HostsManager public class HostsManager
{ {
public bool IsEmpty { get { return _hosts.Count == 0; } }
private readonly Queue<Host> _hosts = new Queue<Host>(); private readonly Queue<Host> _hosts = new Queue<Host>();
public HostsManager(List<Host> hosts) public HostsManager(List<Host> hosts)

5
Client/Program.cs
View File

@ -122,8 +122,11 @@ namespace xClient
ClientData.InstallPath = Path.Combine(Settings.DIR, ((!string.IsNullOrEmpty(Settings.SUBFOLDER)) ? Settings.SUBFOLDER + @"\" : "") + Settings.INSTALLNAME); ClientData.InstallPath = Path.Combine(Settings.DIR, ((!string.IsNullOrEmpty(Settings.SUBFOLDER)) ? Settings.SUBFOLDER + @"\" : "") + Settings.INSTALLNAME);
GeoLocationHelper.Initialize(); GeoLocationHelper.Initialize();
if (_hosts.IsEmpty)
ClientData.Disconnect = true; // no hosts to connect
if (!MutexHelper.CreateMutex(Settings.MUTEX)) if (!MutexHelper.CreateMutex(Settings.MUTEX))
ClientData.Disconnect = true; ClientData.Disconnect = true; // process with same mutex is already running
if (ClientData.Disconnect) if (ClientData.Disconnect)
return; return;

2
Server/Forms/FrmBuilder.cs
View File

@ -213,7 +213,7 @@ namespace xServer.Forms
private void btnBuild_Click(object sender, EventArgs e) private void btnBuild_Click(object sender, EventArgs e)
{ {
if (!string.IsNullOrEmpty(txtTag.Text) && !string.IsNullOrEmpty(txtMutex.Text) && // General Settings if (!string.IsNullOrEmpty(txtTag.Text) && !string.IsNullOrEmpty(txtMutex.Text) && // General Settings
lstHosts.Items.Count > 0 && !string.IsNullOrEmpty(txtPassword.Text) && !string.IsNullOrEmpty(txtDelay.Text) && // Connection _hosts.Count > 0 && !string.IsNullOrEmpty(txtPassword.Text) && !string.IsNullOrEmpty(txtDelay.Text) && // Connection
!chkInstall.Checked || (chkInstall.Checked && !string.IsNullOrEmpty(txtInstallname.Text)) && // Installation !chkInstall.Checked || (chkInstall.Checked && !string.IsNullOrEmpty(txtInstallname.Text)) && // Installation
!chkStartup.Checked || (chkStartup.Checked && !string.IsNullOrEmpty(txtRegistryKeyName.Text))) // Installation !chkStartup.Checked || (chkStartup.Checked && !string.IsNullOrEmpty(txtRegistryKeyName.Text))) // Installation
{ {