Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 03:36:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix SingleInstance

Browse Source
This commit is contained in:
bao-qian
2016-05-09 22:45:20 +01:00
parent 21285f02b8
commit fb3ba16a92
12 changed files with 56 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Wox/Helper/ErrorReporting.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Windows;
using System.Windows.Threading;
using Wox.Infrastructure.Exception;
using Wox.Infrastructure.Logger;
@@ -16,7 +17,7 @@ namespace Wox.Helper
public static void UnhandledExceptionHandle(object sender, UnhandledExceptionEventArgs e)
{
//handle non-ui thread exceptions
App.Window.Dispatcher.Invoke(() =>
Application.Current.MainWindow.Dispatcher.Invoke(() =>
{
Report((Exception)e.ExceptionObject);
if (!(e.ExceptionObject is WoxException))

7
Wox/Helper/SingleInstance.cs
View File

@@ -186,7 +186,7 @@ namespace Wox.Helper
public interface ISingleInstanceApp
{
void OnActivate();
void OnSecondAppStarted();
}
/// <summary>
@@ -416,7 +416,7 @@ namespace Wox.Helper
return;
}
((TApplication)Application.Current).OnActivate();
((TApplication)Application.Current).OnSecondAppStarted();
}
#endregion
@@ -437,8 +437,7 @@ namespace Wox.Helper
if (Application.Current != null)
{
// Do an asynchronous call to ActivateFirstInstance function
Application.Current.Dispatcher.BeginInvoke(
DispatcherPriority.Normal, new DispatcherOperationCallback(ActivateFirstInstanceCallback));
Application.Current.Dispatcher.Invoke(ActivateFirstInstance);
}
}