SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 10:01:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix remaining activity tracker related bugs

Browse Source
This commit is contained in:
pizzaboxer 2024-09-04 17:47:58 +01:00
parent f0ffdbc50c
commit 2805263a63
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Bloxstrap/Integrations/ActivityWatcher.cs
View File

@ -125,7 +125,6 @@ namespace Bloxstrap.Integrations
} }
} }
// TODO: i need to double check how this handles failed game joins (connection error, invalid permissions, etc)
private void ReadLogEntry(string entry) private void ReadLogEntry(string entry)
{ {
const string LOG_IDENT = "ActivityWatcher::ReadLogEntry"; const string LOG_IDENT = "ActivityWatcher::ReadLogEntry";
@ -142,7 +141,17 @@ namespace Bloxstrap.Integrations
App.Logger.WriteLine(LOG_IDENT, $"Read {_logEntriesRead} log entries"); App.Logger.WriteLine(LOG_IDENT, $"Read {_logEntriesRead} log entries");
if (entry.Contains(GameLeavingEntry)) if (entry.Contains(GameLeavingEntry))
OnAppClose?.Invoke(this, new EventArgs()); {
App.Logger.WriteLine(LOG_IDENT, "User is back into the desktop app");
OnAppClose?.Invoke(this, EventArgs.Empty);
if (Data.PlaceId != 0 && !InGame)
{
App.Logger.WriteLine(LOG_IDENT, "User appears to be leaving from a cancelled/errored join");
Data = new();
}
}
if (!InGame && Data.PlaceId == 0) if (!InGame && Data.PlaceId == 0)
{ {

3
Bloxstrap/UI/ViewModels/ContextMenu/ServerHistoryViewModel.cs
View File

@ -36,8 +36,7 @@ namespace Bloxstrap.UI.ViewModels.ContextMenu
if (entries.Any()) if (entries.Any())
{ {
// TODO: this will duplicate universe ids string universeIds = String.Join(',', entries.GroupBy(x => x.UniverseId).Select(x => x.First()));
string universeIds = String.Join(',', entries.Select(x => x.UniverseId));
try try
{ {

1
Bloxstrap/UI/ViewModels/Installer/WelcomeViewModel.cs
View File

@ -1,6 +1,5 @@
namespace Bloxstrap.UI.ViewModels.Installer namespace Bloxstrap.UI.ViewModels.Installer
{ {
// TODO: administrator check?
public class WelcomeViewModel : NotifyPropertyChangedViewModel public class WelcomeViewModel : NotifyPropertyChangedViewModel
{ {
// formatting is done here instead of in xaml, it's just a bit easier // formatting is done here instead of in xaml, it's just a bit easier