Browse Source

Merge branch 'master' into master

pull/2560/head
danwalmsley 7 years ago
committed by GitHub
parent
commit
fb06b24b8d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      src/Avalonia.Controls/Application.cs

15
src/Avalonia.Controls/Application.cs

@ -255,16 +255,13 @@ namespace Avalonia
if (MainWindow == null)
{
Dispatcher.UIThread.Post(() =>
if (!mainWindow.IsVisible)
{
if (!mainWindow.IsVisible)
{
mainWindow.Show();
}
MainWindow = mainWindow;
});
}
mainWindow.Show();
}
MainWindow = mainWindow;
}
return Run(new CancellationTokenSource());
}

Loading…
Cancel
Save