Skip to content

Commit 658e083

Browse files
BitTimBitTim
committed
Fixed Crash on new Season creation (FINALLY!)
1 parent 00579b9 commit 658e083

File tree

6 files changed

+31
-8
lines changed

6 files changed

+31
-8
lines changed

‎VexTrack/Core/Constants.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ static class Constants
1111
public static readonly string DataFolder = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"/VexTrack - Preview";
1212
public static readonly string LegacyDataFolder = @"dat";
1313
public static readonly string UpdateFolder = DataFolder + @"/Update";
14+
public static readonly string LogsFolder = DataFolder + @"/logs";
1415

1516
public static readonly string SettingsPath = DataFolder + @"/settings.json";
1617
public static readonly string DataPath = DataFolder + @"/data.json";

‎VexTrack/Core/DashboardDataCalc.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,13 @@ public static DailyData CalcDailyData(bool epilogue)
2020
int bufferDays = SettingsHelper.Data.BufferDays;
2121
int idealRemainingDays = TrackingDataHelper.GetRemainingDays(TrackingDataHelper.CurrentSeasonUUID) - bufferDays;
2222

23+
if (idealRemainingDays <= -bufferDays && idealRemainingDays <= 0)
24+
{
25+
TrackingDataHelper.CreateSeasonInitPopup();
26+
return ret;
27+
}
28+
2329
if (idealRemainingDays > -bufferDays && idealRemainingDays <= 0) idealRemainingDays = 1;
24-
else if (idealRemainingDays <= -bufferDays && idealRemainingDays <= 0) TrackingDataHelper.CreateSeasonInitPopup();
2530

2631
int dailyCollected = 0;
2732
foreach (HistoryEntry h in TrackingDataHelper.CurrentSeasonData.History.GetRange(1, TrackingDataHelper.CurrentSeasonData.History.Count - 1))

‎VexTrack/Core/Update.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ public static async void CheckUpdateAsync(bool forceUpdate = false)
195195
List<string> warnings = new();
196196
bool collectChangelog = false;
197197
bool showDialog = false;
198+
bool forceUpdateSkippedOnce = false;
198199

199200
JArray ja = JArray.Parse(res);
200201
foreach (JObject release in ja)
@@ -205,7 +206,13 @@ public static async void CheckUpdateAsync(bool forceUpdate = false)
205206
float newestVersion = float.Parse(tokenizedName[1].Split("v")[1]);
206207
float currentVersion = float.Parse(Constants.Version.Split("v")[1]);
207208

208-
if (currentVersion >= newestVersion && !forceUpdate) break;
209+
if (forceUpdateSkippedOnce && forceUpdate) break;
210+
if (currentVersion >= newestVersion)
211+
{
212+
if (!forceUpdate) break;
213+
forceUpdateSkippedOnce = true;
214+
}
215+
209216
if ((bool)release["prerelease"] && SettingsHelper.Data.IgnorePreReleases) continue;
210217

211218
latestVersionTag = (string)release["tag_name"];

‎VexTrack/MVVM/View/Popups/AboutPopup.xaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<RowDefinition Height="Auto"/>
5050
<RowDefinition Height="Auto"/>
5151
<RowDefinition Height="Auto"/>
52+
<RowDefinition Height="Auto"/>
5253
</Grid.RowDefinitions>
5354

5455
<TextBlock Grid.Row="0"
@@ -82,6 +83,15 @@
8283
<TextBlock Text="Created by BitTim, Copyright ©2021 - 2022"
8384
Grid.Row="3"
8485
FontSize="14"
86+
TextWrapping="Wrap"
87+
HorizontalAlignment="Center"
88+
Foreground="{DynamicResource Foreground}"
89+
Margin="0, 0, 0, 32"/>
90+
91+
<TextBlock Text="v2.0 is gonna be big"
92+
Grid.Row="4"
93+
FontSize="14"
94+
FontStyle="Italic"
8595
TextWrapping="Wrap"
8696
HorizontalAlignment="Center"
8797
Foreground="{DynamicResource Foreground}"

‎VexTrack/Properties/PublishProfiles/FolderProfile.pubxml.user‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
44
-->
55
<Project>
66
<PropertyGroup>
7-
<History>True|2022-04-23T13:34:10.2940837Z;True|2022-04-23T14:49:56.1096228+02:00;False|2022-04-23T14:48:07.2583983+02:00;True|2021-10-09T18:18:06.7595219+02:00;True|2021-09-25T13:53:45.6469657+02:00;True|2021-09-25T13:50:42.4330328+02:00;True|2021-08-17T17:49:02.0352516+02:00;True|2021-08-17T17:27:33.8575315+02:00;True|2021-08-17T17:06:31.6865042+02:00;True|2021-08-16T20:32:38.6170493+02:00;True|2021-08-16T19:15:47.4487778+02:00;True|2021-08-16T18:57:52.1937506+02:00;True|2021-08-16T16:55:39.1361001+02:00;True|2021-08-16T16:50:48.1196364+02:00;True|2021-08-16T15:46:13.5753068+02:00;True|2021-08-16T15:42:57.6287483+02:00;True|2021-08-16T15:35:10.4759874+02:00;True|2021-08-16T15:14:29.1127093+02:00;True|2021-08-16T15:13:07.5085065+02:00;True|2021-08-16T14:36:12.2446455+02:00;True|2021-08-15T16:25:42.6055261+02:00;False|2021-08-15T16:22:23.0774038+02:00;False|2021-08-15T16:21:30.1494638+02:00;False|2021-08-15T16:21:04.2805901+02:00;True|2021-08-13T10:15:54.6725225+02:00;True|2021-08-13T10:10:27.5709767+02:00;True|2021-08-13T09:52:28.8007984+02:00;True|2021-08-13T09:52:12.4970269+02:00;True|2021-08-13T09:50:21.0039011+02:00;True|2021-08-13T09:49:30.7597645+02:00;True|2021-08-12T20:45:39.9964695+02:00;</History>
7+
<History>True|2022-04-23T21:53:48.0786924Z;True|2022-04-23T23:46:48.1121868+02:00;True|2022-04-23T22:36:34.8688109+02:00;True|2022-04-23T22:34:07.0430109+02:00;True|2022-04-23T22:32:07.9744304+02:00;True|2022-04-23T22:30:29.0121963+02:00;True|2022-04-23T22:15:54.1970305+02:00;True|2022-04-23T22:11:42.5348907+02:00;True|2022-04-23T15:34:10.2940837+02:00;True|2022-04-23T14:49:56.1096228+02:00;False|2022-04-23T14:48:07.2583983+02:00;True|2021-10-09T18:18:06.7595219+02:00;True|2021-09-25T13:53:45.6469657+02:00;True|2021-09-25T13:50:42.4330328+02:00;True|2021-08-17T17:49:02.0352516+02:00;True|2021-08-17T17:27:33.8575315+02:00;True|2021-08-17T17:06:31.6865042+02:00;True|2021-08-16T20:32:38.6170493+02:00;True|2021-08-16T19:15:47.4487778+02:00;True|2021-08-16T18:57:52.1937506+02:00;True|2021-08-16T16:55:39.1361001+02:00;True|2021-08-16T16:50:48.1196364+02:00;True|2021-08-16T15:46:13.5753068+02:00;True|2021-08-16T15:42:57.6287483+02:00;True|2021-08-16T15:35:10.4759874+02:00;True|2021-08-16T15:14:29.1127093+02:00;True|2021-08-16T15:13:07.5085065+02:00;True|2021-08-16T14:36:12.2446455+02:00;True|2021-08-15T16:25:42.6055261+02:00;False|2021-08-15T16:22:23.0774038+02:00;False|2021-08-15T16:21:30.1494638+02:00;False|2021-08-15T16:21:04.2805901+02:00;True|2021-08-13T10:15:54.6725225+02:00;True|2021-08-13T10:10:27.5709767+02:00;True|2021-08-13T09:52:28.8007984+02:00;True|2021-08-13T09:52:12.4970269+02:00;True|2021-08-13T09:50:21.0039011+02:00;True|2021-08-13T09:49:30.7597645+02:00;True|2021-08-12T20:45:39.9964695+02:00;</History>
88
</PropertyGroup>
99
</Project>

‎VexTrack/Properties/Settings.Designer.cs‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)