mirrors/Remotely
3
0
Fork 0
mirror of https://github.com/immense/Remotely.git synced 2025-10-26 11:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run WinForms Application earlier.

Browse Source
This commit is contained in:
Jared 2020-09-03 18:59:39 -07:00 committed by Jared Goodwin
parent f3797b00bb
commit ec36616732
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Desktop.Win/Program.cs
View File

@ -50,7 +50,7 @@ namespace Remotely.Desktop.Win
if (Conductor.Mode == Core.Enums.AppMode.Chat)
{
StartUiThread(null);
StartUiThreads(null);
await Task.Run(async () =>
{
var chatService = Services.GetRequiredService<IChatHostService>();
@ -59,7 +59,7 @@ namespace Remotely.Desktop.Win
}
else if (Conductor.Mode == Core.Enums.AppMode.Unattended)
{
StartUiThread(null);
StartUiThreads(null);
App.Current.Dispatcher.Invoke(() =>
{
App.Current.ShutdownMode = ShutdownMode.OnExplicitShutdown;
@ -68,10 +68,10 @@ namespace Remotely.Desktop.Win
}
else
{
StartUiThread(() => new MainWindow());
StartUiThreads(() => new MainWindow());
}
System.Windows.Forms.Application.Run(BackgroundForm);
Thread.Sleep(Timeout.Infinite);
}
catch (Exception ex)
{
@ -163,9 +163,9 @@ namespace Remotely.Desktop.Win
Services.GetRequiredService<IClipboardService>().BeginWatching();
}
private static void StartUiThread(Func<Window> createWindowFunc)
private static void StartUiThreads(Func<Window> createWindowFunc)
{
var uiThread = new Thread(() =>
var wpfUiThread = new Thread(() =>
{
var app = new App();
app.InitializeComponent();
@ -178,8 +178,17 @@ namespace Remotely.Desktop.Win
app.Run(createWindowFunc());
}
});
uiThread.TrySetApartmentState(ApartmentState.STA);
uiThread.Start();
wpfUiThread.TrySetApartmentState(ApartmentState.STA);
wpfUiThread.Start();
var winformsThread = new Thread(() =>
{
System.Windows.Forms.Application.Run(BackgroundForm);
});
winformsThread.TrySetApartmentState(ApartmentState.STA);
winformsThread.Start();
while (App.Current is null)
{
Thread.Sleep(100);