Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #52

Merged
merged 18 commits into from
Sep 1, 2024
Merged

Dev #52

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Gml.Launcher/App.axaml.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System.Threading.Tasks;
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using Gml.Launcher.ViewModels;
using Gml.Launcher.Views;
using Gml.Launcher.Views.SplashScreen;

namespace Gml.Launcher;

Expand All @@ -13,7 +15,7 @@ public override void Initialize()
AvaloniaXamlLoader.Load(this);
}

public override void OnFrameworkInitializationCompleted()
public override async void OnFrameworkInitializationCompleted()
{
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ public static class ResourceKeysDictionary
public const string MainPageTitle = "DefaultPageTitle";
public const string DefaultPageTitle = "DefaultPageTitle";
public const string Error = "Error";
public const string GameProfileError = "GameProfileError";
public const string InvalidFolder = "InvalidFolder";
public const string NotSetting = "NotSetting";
public const string Updating = "Updating";
Expand All @@ -14,7 +15,6 @@ public static class ResourceKeysDictionary
public const string PlayDRpcText = "PlayDRpcText";
public const string Launching = "Launching";
public const string PreparingLaunch = "PreparingLaunch";
public const string GameProfileError = "GameProfileError";
public const string CheckingFileIntegrity = "CheckingFileIntegrity";
public const string ProfileNotConfigured = "ProfileNotConfigured";
public const string UpdatingDescription = "UpdatingDescription";
Expand Down
1 change: 1 addition & 0 deletions src/Gml.Launcher/ViewModels/Pages/OverviewPageViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ private async Task<Process> GenerateProcess(CancellationToken cancellationToken,

process.ErrorDataReceived += (sender, e) =>
{
Console.WriteLine(e?.Data);
if (!string.IsNullOrEmpty(e.Data) && !e.Data.Contains("[gml-patch]"))
{
ShowError(ResourceKeysDictionary.GameProfileError, e.Data);
Expand Down
Loading