From e6f19a4abf8184c386509480d0482a5e36a8994c Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Wed, 11 Nov 2015 00:33:33 +0000
Subject: [PATCH 1/4] Fix unhandled exception

---
 Wox/App.config  | 5 -----
 Wox/App.xaml.cs | 2 +-
 Wox/Wox.csproj  | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Wox/App.config b/Wox/App.config
index 55ab1e0d9d..c718ae367c 100644
--- a/Wox/App.config
+++ b/Wox/App.config
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 <configuration>
-  <runtime>
-    <!--http://stackoverflow.com/questions/186854/how-to-prevent-an-exception-in-a-background-thread-from-terminating-an-application-->
-    <!--prevent non-ui exception crash wox-->
-    <legacyUnhandledExceptionPolicy enabled="1" />
-  </runtime>
   <startup>
     <supportedRuntime version="v2.0.50727" />
     <supportedRuntime version="v4.0" />
diff --git a/Wox/App.xaml.cs b/Wox/App.xaml.cs
index 5b239e0851..4e87e6a4db 100644
--- a/Wox/App.xaml.cs
+++ b/Wox/App.xaml.cs
@@ -42,7 +42,7 @@ namespace Wox
 
         }
 
-        [Conditional("DEBUG")]
+        [Conditional("RELEASE")]
         private void RegisterUnhandledException()
         {
             // let exception throw as normal is better for Debug
diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index 7d46e6109a..cd72afb976 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -48,7 +48,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\Output\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;RELEASE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

From 11aed2ab6102e005d4ca85060c33d5dbb990b2aa Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Wed, 11 Nov 2015 00:42:34 +0000
Subject: [PATCH 2/4] Fix output path for Wox.Core

---
 Wox.Core/Wox.Core.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Wox.Core/Wox.Core.csproj b/Wox.Core/Wox.Core.csproj
index d69ae6a8d6..f8d1129aef 100644
--- a/Wox.Core/Wox.Core.csproj
+++ b/Wox.Core/Wox.Core.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\Output\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

From 5e4cfbaf3f1c984ed8fa18c03785da780d86829e Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Wed, 11 Nov 2015 00:42:49 +0000
Subject: [PATCH 3/4] Better error log

---
 Wox.Infrastructure/Logger/Log.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Wox.Infrastructure/Logger/Log.cs b/Wox.Infrastructure/Logger/Log.cs
index 25527baefb..d911e5bcb2 100644
--- a/Wox.Infrastructure/Logger/Log.cs
+++ b/Wox.Infrastructure/Logger/Log.cs
@@ -1,4 +1,5 @@
-using NLog;
+using System.Diagnostics;
+using NLog;
 using Wox.Infrastructure.Exception;
 
 namespace Wox.Infrastructure.Logger
@@ -12,7 +13,12 @@ namespace Wox.Infrastructure.Logger
 #if DEBUG
             throw e;
 #else
-            logger.Error(e.Message + "\r\n" + e.StackTrace);
+            while (e.InnerException != null)
+            {
+                logger.Error(e.Message);
+                logger.Error(e.StackTrace);
+                e = e.InnerException;
+            }
 #endif
         }
 

From 49bf86a8d5c06e0a68a5c775a9e67a5045ef5d15 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Wed, 11 Nov 2015 01:17:37 +0000
Subject: [PATCH 4/4] Fix missing dll for CMD plugin

1. Fix #382
2. Part of #387
---
 Wox/Wox.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index cd72afb976..3275ed7398 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -364,7 +364,6 @@ cd "$(TargetDir)Plugins" &amp; del /s /q NAppUpdate.Framework.dll
 cd "$(TargetDir)Plugins" &amp; del /s /q Wox.Infrastructure.dll
 cd "$(TargetDir)Plugins" &amp; del /s /q Wox.Infrastructure.pdb
 cd "$(TargetDir)Plugins" &amp; del /s /q Newtonsoft.Json.dll
-cd "$(TargetDir)Plugins" &amp; del /s /q WindowsInput.dll
 )</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.