Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-16 21:38:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update settings load

Browse source 
bad settings files cause exceptions, silently delete them
move language init out of loadconfig (want it to happen regardless of
config errors, so load config value instead)
This commit is contained in:
Kurt 2017-01-09 19:15:46 -08:00
parent 1fcdffc654
commit c9e721fc5b
3 changed files with 54 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
PKHeX.WinForms/MainWindow/Main.cs
View file

@ -136,8 +136,17 @@ namespace PKHeX.WinForms
bool showChangelog = false;
bool BAKprompt = false;
try { loadConfig(out BAKprompt, out showChangelog); }
catch { }
int languageID = 1; // English
try
{
ConfigUtil.checkConfig();
loadConfig(out BAKprompt, out showChangelog, out languageID);
}
catch (Exception e)
{
WinFormsUtil.Error("Failed to access settings:" + Environment.NewLine + e.Message, "Please delete corrupt user.config file.");
}
CB_MainLanguage.SelectedIndex = languageID;
InitializeFields();
formInitialized = true;
@ -236,36 +245,41 @@ namespace PKHeX.WinForms
#endregion
#region //// MAIN MENU FUNCTIONS ////
private void loadConfig(out bool BAKprompt, out bool showChangelog)
private void loadConfig(out bool BAKprompt, out bool showChangelog, out int languageID)
{
BAKprompt = false;
showChangelog = false;
unicode = Menu_Unicode.Checked = Properties.Settings.Default.Unicode;
languageID = 1;
var Settings = Properties.Settings.Default;
Settings.Upgrade();
unicode = Menu_Unicode.Checked = Settings.Unicode;
updateUnicode();
SaveFile.SetUpdateDex = Menu_ModifyDex.Checked = Properties.Settings.Default.SetUpdateDex;
SaveFile.SetUpdatePKM = Menu_ModifyPKM.Checked = Properties.Settings.Default.SetUpdatePKM;
SaveFile.SetUpdateDex = Menu_ModifyDex.Checked = Settings.SetUpdateDex;
SaveFile.SetUpdatePKM = Menu_ModifyPKM.Checked = Settings.SetUpdatePKM;
// Select Language
string l = Properties.Settings.Default.Language;
string l = Settings.Language;
int lang = Array.IndexOf(GameInfo.lang_val, l);
if (lang < 0) Array.IndexOf(GameInfo.lang_val, "en");
CB_MainLanguage.SelectedIndex = lang < 0 ? 1 : lang;
languageID = lang < 0 ? 1 : lang;
// Version Check
if (Properties.Settings.Default.Version.Length > 0) // already run on system
if (Settings.Version.Length > 0) // already run on system
{
int lastrev; int.TryParse(Properties.Settings.Default.Version, out lastrev);
int lastrev; int.TryParse(Settings.Version, out lastrev);
int currrev; int.TryParse(Core.Properties.Resources.ProgramVersion, out currrev);
showChangelog = lastrev < currrev;
}
// BAK Prompt
if (!Properties.Settings.Default.BAKPrompt)
BAKprompt = Properties.Settings.Default.BAKPrompt = true;
if (!Settings.BAKPrompt)
BAKprompt = Settings.BAKPrompt = true;
Properties.Settings.Default.Version = Core.Properties.Resources.ProgramVersion;
Properties.Settings.Default.Save();
Settings.Version = Core.Properties.Resources.ProgramVersion;
Settings.Save();
}
// Main Menu Strip UI Functions
private void mainMenuOpen(object sender, EventArgs e)

2
PKHeX.WinForms/PKHeX.WinForms.csproj
View file

@ -72,6 +72,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
@ -333,6 +334,7 @@
<Compile Include="Subforms\SAV_MysteryGiftDB.Designer.cs">
<DependentUpon>SAV_MysteryGiftDB.cs</DependentUpon>
</Compile>
<Compile Include="Util\ConfigUtil.cs" />
<Compile Include="Util\CyberGadgetUtil.cs" />
<Compile Include="Util\FontUtil.cs" />
<Compile Include="Util\WinFormsUtil.cs" />

24
PKHeX.WinForms/Util/ConfigUtil.cs Normal file
View file

@ -0,0 +1,24 @@
using System.Configuration;
using System.IO;
namespace PKHeX.WinForms
{
public static class ConfigUtil
{
public static bool checkConfig()
{
try
{
ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.PerUserRoamingAndLocal);
return true;
}
catch (ConfigurationErrorsException e)
{
string path = (e.InnerException as ConfigurationErrorsException)?.Filename;
if (path != null)
File.Delete(path);
return false;
}
}
}
}