jonny_bro/CreamInstaller
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update 1.0.4

Browse source 
- Fixed unhandled exceptions when cleaning up files
- Added Mutex to make sure only one instance of program is active at a time
This commit is contained in:
pointfeev 2021-07-30 06:01:42 -05:00
parent 8caf8b91b7
commit 8edcd53017
3 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CreamInstaller/CreamInstaller.csproj
View file

@ -43,12 +43,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="MainForm.cs"> <Compile Update="MainForm.cs" />
<SubType>Form</SubType> <Compile Update="SelectForm.cs" />
</Compile>
<Compile Update="SelectForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="Properties\Resources.Designer.cs"> <Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>

4
CreamInstaller/InstallForm.cs
View file

@ -55,7 +55,7 @@ namespace CreamInstaller
{ {
File.Delete(Program.OutputFile); File.Delete(Program.OutputFile);
} }
catch (UnauthorizedAccessException) catch
{ {
throw new Exception("Unable to delete old archive file for " + selection.ProgramName); throw new Exception("Unable to delete old archive file for " + selection.ProgramName);
} }
@ -121,7 +121,7 @@ namespace CreamInstaller
{ {
File.Delete(file); File.Delete(file);
} }
catch (UnauthorizedAccessException) catch
{ {
throw new Exception("Unable to delete Steam API files for " + selection.ProgramName); throw new Exception("Unable to delete Steam API files for " + selection.ProgramName);
} }

11
CreamInstaller/Program.cs
View file

@ -18,6 +18,9 @@ namespace CreamInstaller
[return: MarshalAs(UnmanagedType.Bool)] [return: MarshalAs(UnmanagedType.Bool)]
static extern bool AllocConsole(); static extern bool AllocConsole();
[DllImport("user32.dll")]
static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
public static string ApplicationName = "CreamInstaller v" + Application.ProductVersion + ": CreamAPI Downloader & Installer"; public static string ApplicationName = "CreamInstaller v" + Application.ProductVersion + ": CreamAPI Downloader & Installer";
public static Assembly EntryAssembly = Assembly.GetEntryAssembly(); public static Assembly EntryAssembly = Assembly.GetEntryAssembly();
@ -27,6 +30,10 @@ namespace CreamInstaller
[STAThread] [STAThread]
static void Main() static void Main()
{
bool createdNew = true;
Mutex mutex = new Mutex(true, "CreamInstaller", out createdNew);
if (createdNew)
{ {
Application.SetHighDpiMode(HighDpiMode.SystemAware); Application.SetHighDpiMode(HighDpiMode.SystemAware);
Application.EnableVisualStyles(); Application.EnableVisualStyles();
@ -34,6 +41,8 @@ namespace CreamInstaller
Application.ApplicationExit += new EventHandler(OnApplicationExit); Application.ApplicationExit += new EventHandler(OnApplicationExit);
Application.Run(new MainForm()); Application.Run(new MainForm());
} }
mutex.Close();
}
public static bool IsFilePathLocked(this string filePath) public static bool IsFilePathLocked(this string filePath)
{ {
@ -111,7 +120,7 @@ namespace CreamInstaller
{ {
File.Delete(OutputFile); File.Delete(OutputFile);
} }
catch (UnauthorizedAccessException) catch
{ {
InstallForm?.UpdateUser($"WARNING: Couldn't clean up downloaded archive ({OutputFile})", LogColor.Warning); InstallForm?.UpdateUser($"WARNING: Couldn't clean up downloaded archive ({OutputFile})", LogColor.Warning);
} }