1.4.3 #38

Merged
Hesham merged 25 commits from release/1.4.3 into master 2018-12-21 22:19:53 +01:00
2 changed files with 13 additions and 3 deletions
Showing only changes of commit 44595496be - Show all commits

View File

@ -83,10 +83,19 @@ namespace OWTrack
MessageBox.Show("Can not create save directory.\n" + e.Message);
}
if (saveManeger.saveExist())
{
try
{
try
{
tr = saveManeger.GetSavedTracker();
}
catch (Exception)
{
MessageBox.Show("Could not load Save.\n" +
"Starting new save.");
tr = new Tracker();
}
if (tr.startSR > 0) SRonce = true;
if (tr.settings.GamePath == "" || tr.settings.GamePath == null)
{

View File

@ -55,9 +55,10 @@ namespace OWTrack
{
return JsonConvert.DeserializeObject<Tracker>(File.ReadAllText(Paths.GetSaves()));
}
catch (Exception e)
catch (Exception)
{
throw e;
Exception ex = new Exception("json");
throw ex;
}
}