Hesham/OWtrack
1
0
Fork 0
Code Issues 2 Pull Requests Releases 10 Wiki Activity

1.4.3 #38

Merged
Hesham merged 25 commits from release/1.4.3 into master 2018-12-21 22:19:53 +01:00
Conversation 1 Commits 25 Files Changed 8 +13 -3
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 44595496be - Show all commits

9
OWTrack/MainForm.cs
View File

@ -83,10 +83,19 @@ namespace OWTrack
MessageBox.Show("Can not create save directory.\n" + e.Message); MessageBox.Show("Can not create save directory.\n" + e.Message);
} }
if (saveManeger.saveExist()) if (saveManeger.saveExist())
{
try
{ {
try try
{ {
tr = saveManeger.GetSavedTracker(); 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.startSR > 0) SRonce = true;
if (tr.settings.GamePath == "" || tr.settings.GamePath == null) if (tr.settings.GamePath == "" || tr.settings.GamePath == null)
{ {

5
OWTrack/saveManeger.cs
View File

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