Skip to content

Commit

Permalink
Merge branch 'master' of gitlab.futo.org:videostreaming/Grayjay.Desktop
Browse files Browse the repository at this point in the history
  • Loading branch information
Koen J committed Mar 1, 2025
2 parents 45a0b87 + 142b45a commit ec59e7e
Show file tree
Hide file tree
Showing 7 changed files with 242 additions and 153 deletions.
3 changes: 3 additions & 0 deletions Grayjay.ClientServer/Grayjay.ClientServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@
<Content Include="Changelogs\4.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Changelogs\5.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>

<Content Include="logo.ico">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
6 changes: 4 additions & 2 deletions Grayjay.ClientServer/States/StateApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public static void WriteTextFile(string name, string text)
}


public static void Startup()
public static async Task Startup()
{
if (Connection != null)
throw new InvalidOperationException("Connection already set");
Expand All @@ -91,6 +91,8 @@ public static void Startup()
Logger.i(nameof(StateApp), "Startup: Initializing PluginEncryptionProvider");
PluginDescriptor.Encryption = new PluginEncryptionProvider();

await StatePlatform.UpdateAvailableClients(true);

Logger.i(nameof(StateApp), "Startup: Initializing DatabaseConnection");
Connection = new DatabaseConnection();

Expand Down Expand Up @@ -148,7 +150,7 @@ public static void Startup()
}).Start();

//Temporary workaround for youtube
Task.Run(() =>
ThreadPool.Run(() =>
{
StatePlatform.GetHome();
});
Expand Down
Loading

0 comments on commit ec59e7e

Please sign in to comment.