fixed バグ

anoyetta · Sep 3, 2021 · 39f7b87 · 39f7b87
1 parent 6c6a7fd
commit 39f7b87
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 17 deletions.
diff --git a/source/CeVIOAIProxy/App.xaml.cs b/source/CeVIOAIProxy/App.xaml.cs
@@ -32,6 +32,7 @@ public App()
             this.Exit += this.App_Exit;
 
             this.DispatcherUnhandledException += this.App_DispatcherUnhandledException;
+            TaskScheduler.UnobservedTaskException += this.TaskScheduler_UnobservedTaskException;
             AppDomain.CurrentDomain.UnhandledException += this.CurrentDomain_UnhandledException;
         }
 
@@ -95,6 +96,14 @@ private void CloseServer()
         private void App_DispatcherUnhandledException(
             object sender,
             DispatcherUnhandledExceptionEventArgs e)
+        {
+            e.Handled = true;
+            this.DumpUnhandledException(e.Exception);
+        }
+
+        private void TaskScheduler_UnobservedTaskException(
+            object sender,
+            UnobservedTaskExceptionEventArgs e)
         {
             this.DumpUnhandledException(e.Exception);
         }
@@ -106,30 +115,27 @@ private void CurrentDomain_UnhandledException(
             this.DumpUnhandledException(e.ExceptionObject as Exception);
         }
 
-        private async void DumpUnhandledException(
+        private void DumpUnhandledException(
             Exception ex)
         {
-            await Task.Run(() =>
+            if (!Directory.Exists(Config.AppData))
             {
-                if (!Directory.Exists(Config.AppData))
-                {
-                    Directory.CreateDirectory(Config.AppData);
-                }
-
-                File.WriteAllText(
-                    Path.Combine(Config.AppData, @".\CeVIOAIProxy.error.log"),
-                    $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}\n{ex}",
-                    new UTF8Encoding(false));
-            });
+                Directory.CreateDirectory(Config.AppData);
+            }
 
+            File.WriteAllText(
+                Path.Combine(Config.AppData, @".\CeVIOAIProxy.error.log"),
+                $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}\n{ex}",
+                new UTF8Encoding(false));
             this.CloseServer();
+
             CeVIOAIProxy.MainWindow.Instance?.HideNotifyIcon();
             Config.Instance.Save();
 
             MessageBox.Show(
                 "予期しない例外を検知しました。アプリケーションを終了します。\n\n" +
                 ex,
-                "Fatal",
+                "Fatal - CeVIO AI Proxy",
                 MessageBoxButton.OK,
                 MessageBoxImage.Error);
 

diff --git a/source/CeVIOAIProxy/CeVIOAIProxy.csproj b/source/CeVIOAIProxy/CeVIOAIProxy.csproj
@@ -11,15 +11,15 @@
     <AssemblyOriginatorKeyFile>CeVIOAIProxy.pfx</AssemblyOriginatorKeyFile>
     <Authors>anoyetta</Authors>
     <Copyright>(c) 2021 anoyetta</Copyright>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
+    <AssemblyVersion>1.2.0.1</AssemblyVersion>
     <PackageIcon>share.ico</PackageIcon>
     <PackageIconUrl />
     <PackageProjectUrl>https://github.com/anoyetta/CeVIOAIProxy</PackageProjectUrl>
     <RepositoryUrl>https://github.com/anoyetta/CeVIOAIProxy.git</RepositoryUrl>
     <RepositoryType>GitHub</RepositoryType>
-    <Version>1.0.4</Version>
+    <Version>1.2.0.1</Version>
     <StartupObject>CeVIOAIProxy.App</StartupObject>
-    <FileVersion>1.2.0.0</FileVersion>
+    <FileVersion>1.2.0.1</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/source/CeVIOAIProxy/Servers/BouyomiChanHttpServer.cs b/source/CeVIOAIProxy/Servers/BouyomiChanHttpServer.cs
@@ -16,7 +16,7 @@ public BouyomiChanHttpServer(
             int port)
         {
             this.server = new HttpListener();
-            this.server.Prefixes.Add($"http://+:{port}/");
+            this.server.Prefixes.Add($"http://localhost:{port}/");
             this.server.Start();
             this.server.BeginGetContext(this.GetContextCallback, null);
         }

diff --git a/source/CeVIOAIProxy/app.manifest b/source/CeVIOAIProxy/app.manifest
@@ -5,6 +5,9 @@
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
         <!-- 通常 -->
+        <!--
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+        -->
         <requestedExecutionLevel level="asInvoker" uiAccess="false" />
 
         <!-- 管理者権限 -->