prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dev' of https://github.com/qianlifeng/Wox into dev

Browse source
This commit is contained in:
qianlifeng 2014-09-19 17:26:28 +08:00
commit 6e10dc2893
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -2,4 +2,4 @@ Wox [![Build status](https://ci.appveyor.com/api/projects/status/bfktntbivg32e
=========
This is Wox Dev branch. We will develop new feature here and merge to master when we want to release a new version.
**Please send pull request to this branch if you wanto to contribute codes**
**Please send pull request to this branch if you want to contribute codes**

12
Wox.Plugin.SystemPlugins/Calculator.cs
View file

@ -49,8 +49,16 @@ namespace Wox.Plugin.SystemPlugins
SubTitle = "Copy this number to the clipboard",
Action = (c) =>
{
Clipboard.SetText(result.Result);
return true;
try
{
Clipboard.SetText(result.Result);
return true;
}
catch (System.Runtime.InteropServices.ExternalException e)
{
MessageBox.Show("Copy failed, please try later");
return false;
}
}
} };
}

6
Wox.Plugin.SystemPlugins/WebSearch/WebSearchPlugin.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
@ -42,7 +42,7 @@ namespace Wox.Plugin.SystemPlugins
IcoPath = webSearch.IconPath,
Action = (c) =>
{
Process.Start(webSearch.Url.Replace("{q}", keyword));
Process.Start(webSearch.Url.Replace("{q}", Uri.EscapeDataString(keyword)));
return true;
}
}
@ -66,7 +66,7 @@ namespace Wox.Plugin.SystemPlugins
IcoPath = webSearch.IconPath,
Action = (c) =>
{
Process.Start(webSearch.Url.Replace("{q}", o));
Process.Start(webSearch.Url.Replace("{q}", Uri.EscapeDataString(o)));
return true;
}
}).ToList());

12
Wox/Helper/ErrorReporting/ErrorReporting.cs
View file

@ -28,26 +28,22 @@ namespace Wox.Helper.ErrorReporting
public static void DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
{
if (System.Diagnostics.Debugger.IsAttached) return;
if (Debugger.IsAttached) return;
e.Handled = true;
string error = CreateExceptionReport("System.Windows.Application.DispatcherUnhandledException", e.Exception);
Log.Error(error);
if (TryShowErrorMessageBox(error, e.Exception))
{
Environment.Exit(0);
}
TryShowErrorMessageBox(error, e.Exception);
}
public static void ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
{
if (System.Diagnostics.Debugger.IsAttached) return;
if (Debugger.IsAttached) return;
string error = CreateExceptionReport("System.Windows.Forms.Application.ThreadException", e.Exception);
Log.Fatal(error);
TryShowErrorMessageBox(error, e.Exception);
Environment.Exit(0);
}
private static string CreateExceptionReport(string ev, object exceptionObject)
@ -98,7 +94,7 @@ namespace Wox.Helper.ErrorReporting
else
{
sb.AppendLine(exceptionObject.GetType().FullName);
sb.AppendLine(new System.Diagnostics.StackTrace().ToString());
sb.AppendLine(new StackTrace().ToString());
sb.AppendLine("```");
sb.AppendLine();
}