ensl/NaturalLauncher
0
0
Fork 0
mirror of https://github.com/ENSL/NaturalLauncher.git synced 2024-11-25 21:51:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

More crash dump report for mé !

Browse source
This commit is contained in:
Mael-fixe 2018-08-30 01:16:42 +02:00
parent 0f68abd8b0
commit bc75172dc6
7 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CleanAndLaunch/CleanAndLaunch.csproj
View file

@ -21,6 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>

1
ManifestBuilder/ManifestBuilder.csproj
View file

@ -21,6 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>

15
NaturalLauncher/MainWindow.xaml.cs
View file

@ -254,12 +254,19 @@ namespace NaturalLauncher
private void Setting_Click(object sender, RoutedEventArgs e) private void Setting_Click(object sender, RoutedEventArgs e)
{ {
if (sw == null) try
{ {
sw = new Settings(); if (sw == null)
{
sw = new Settings();
}
sw.SetMainWindowRef(this);
sw.Show();
}
catch(Exception exception)
{
App.SendReport(exception, "Could Not Open Setting window");
} }
sw.SetMainWindowRef(this);
sw.Show();
} }
private void Verify_Click(object sender, RoutedEventArgs e) private void Verify_Click(object sender, RoutedEventArgs e)

1
NaturalLauncher/NaturalLauncher.csproj
View file

@ -45,6 +45,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>

4
NaturalLauncher/Properties/AssemblyInfo.cs
View file

@ -49,5 +49,5 @@ using System.Windows;
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
// en utilisant '*', comme indiqué ci-dessous : // en utilisant '*', comme indiqué ci-dessous :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.1.0")]
[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.1.0")]

8
NaturalLauncher/SelfUpdater.cs
View file

@ -277,7 +277,8 @@ namespace NaturalLauncher
if (publicKey == null) if (publicKey == null)
{ {
throw new ArgumentNullException("publicKey"); MessageBoxResult AlertBox = MessageBox.Show("Your launcher is missing the public crypto key", "Error!", MessageBoxButton.OK, MessageBoxImage.Error);
throw new ArgumentNullException("MissingKeyFile");
} }
if (signature == null) if (signature == null)
@ -293,7 +294,10 @@ namespace NaturalLauncher
public static X509Certificate2 LoadPublicKey(string PublicKeyPath) public static X509Certificate2 LoadPublicKey(string PublicKeyPath)
{ {
return new X509Certificate2(PublicKeyPath); if(File.Exists(PublicKeyPath))
return new X509Certificate2(PublicKeyPath);
else
throw new ArgumentNullException("MissingKeyFile");
} }
public static byte[] StringToByte(string str) public static byte[] StringToByte(string str)

22
NaturalLauncher/Settings.xaml.cs
View file

@ -59,12 +59,18 @@ namespace NaturalLauncher
break; break;
} }
XmlBuilder.ReadConfigXml(out string uno, out bool dos, out string discordStatus, out bool keepAlive); try
Launcher.keepLauncherAlive = keepAlive; {
DiscordTxtbox.Text = discordStatus; XmlBuilder.ReadConfigXml(out string uno, out bool dos, out string discordStatus, out bool keepAlive);
KeepAliveChecker.IsChecked = keepAlive; Launcher.keepLauncherAlive = keepAlive;
DiscordTxtbox.Text = discordStatus;
windowfullyopen = true; KeepAliveChecker.IsChecked = keepAlive;
windowfullyopen = true;
}
catch(Exception exception)
{
App.SendReport(exception, "Could Not Read ConfigXml");
}
} }
@ -200,6 +206,10 @@ namespace NaturalLauncher
Launcher.HLFolder = folderPath; Launcher.HLFolder = folderPath;
Launcher.NSFolder = folderPath + System.IO.Path.DirectorySeparatorChar + "ns"; Launcher.NSFolder = folderPath + System.IO.Path.DirectorySeparatorChar + "ns";
} }
else
{
// throw new FileNotFoundException("Could not find HL folder"); // no need to crash the launcher for this
}
MainWindowReference.CallUpdateGame(); MainWindowReference.CallUpdateGame();
} }