Merge pull request #85 from microsoft/user/ryanbod/fix_catastrophic_failure

Fixing xaml catastrophic failure,
This commit is contained in:
ryanbodrug-microsoft
2020-04-09 09:40:31 -07:00
committed by GitHub

View File

@@ -18,10 +18,12 @@ using Stopwatch = Wox.Infrastructure.Stopwatch;
namespace PowerLauncher namespace PowerLauncher
{ {
public partial class App : IDisposable, ISingleInstanceApp public partial class App : IDisposable, ISingleInstanceApp
{ {
public static PublicAPIInstance API { get; private set; } public static PublicAPIInstance API { get; private set; }
private const string Unique = "Wox_Unique_Application_Mutex"; private const string Unique = "PowerLauncher_Unique_Application_Mutex";
private static bool _disposed; private static bool _disposed;
private Settings _settings; private Settings _settings;
private MainViewModel _mainVM; private MainViewModel _mainVM;
@@ -33,6 +35,8 @@ namespace PowerLauncher
public static void Main() public static void Main()
{ {
if (SingleInstance<App>.InitializeAsFirstInstance(Unique)) if (SingleInstance<App>.InitializeAsFirstInstance(Unique))
{
using (new UI.App())
{ {
using (var application = new App()) using (var application = new App())
{ {
@@ -41,6 +45,7 @@ namespace PowerLauncher
} }
} }
} }
}
private void OnStartup(object sender, StartupEventArgs e) private void OnStartup(object sender, StartupEventArgs e)
{ {