別のバージョンがインストールされている際にエラーを表示＆既定のプロファイル名を修正

Takym · Apr 11, 2020 · 96aedbb · 96aedbb
1 parent a5161ff
commit 96aedbb
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 9 deletions.
diff --git a/AupLauncher/Program.cs b/AupLauncher/Program.cs
@@ -14,8 +14,8 @@ public static class Program
 		public const string Description    = "Launcher for AviUtl & Audacity Project Files";
 		public const string Author         = "Takym";
 		public const string Copyright      = "Copyright (C) 2020 Takym.";
-		public const string Version        = "0.0.0.6";
-		public const string CodeName       = "aupl00a6";
+		public const string Version        = "0.0.0.7";
+		public const string CodeName       = "aupl00a7";
 
 		public static Settings Settings { get; private set; }
 
@@ -38,8 +38,15 @@ internal static int Main(string[] args)
 					}
 				}
 #if !DEBUG
+			} catch (NotSupportedException nse) {
+				MessageBox.Show(
+					Resources.Message_AnotherVersionInstalled,
+					Caption,
+					MessageBoxButtons.OK,
+					MessageBoxIcon.Error);
+				return SaveErrorReport(nse, true);
 			} catch (Exception e) {
-				return SaveErrorReport(e);
+				return SaveErrorReport(e, true);
 #endif
 			}
 		}
@@ -156,7 +163,7 @@ public static string CreateArgs(string format, string args)
 			}
 		}
 
-		public static int SaveErrorReport(Exception e)
+		public static int SaveErrorReport(Exception e, bool showMsg)
 		{
 			var    dt    = DateTime.Now;
 			int    pid   = Process.GetCurrentProcess().Id;
@@ -195,11 +202,13 @@ public static int SaveErrorReport(Exception e)
 					e = e.InnerException; ++n;
 				} while (e != null);
 			}
-			MessageBox.Show(
-				string.Format(Resources.Message_ErrorReport, msg, fname),
-				Caption,
-				MessageBoxButtons.OK,
-				MessageBoxIcon.Error);
+			if (showMsg) {
+				MessageBox.Show(
+					string.Format(Resources.Message_ErrorReport, msg, fname),
+					Caption,
+					MessageBoxButtons.OK,
+					MessageBoxIcon.Error);
+			}
 			return ret;
 		}
 

diff --git a/AupLauncher/Properties/Resources.Designer.cs b/AupLauncher/Properties/Resources.Designer.cs
diff --git a/AupLauncher/Properties/Resources.en.resx b/AupLauncher/Properties/Resources.en.resx
@@ -193,6 +193,9 @@
   <data name="ER_Line8_Title" xml:space="preserve">
     <value>## Exception Information ({0})</value>
   </data>
+  <data name="Message_AnotherVersionInstalled" xml:space="preserve">
+    <value>The another version of this program is already installed on your computer.</value>
+  </data>
   <data name="Message_ConfirmClosing" xml:space="preserve">
     <value>Settings are changed. Do you want to save?
 If you click [Yes] button, save changes and close.

diff --git a/AupLauncher/Properties/Resources.ja.resx b/AupLauncher/Properties/Resources.ja.resx
@@ -193,6 +193,9 @@
   <data name="ER_Line8_Title" xml:space="preserve">
     <value>□例外の情報 ({0})</value>
   </data>
+  <data name="Message_AnotherVersionInstalled" xml:space="preserve">
+    <value>既に別のバージョンがインストールされているため、起動できません。</value>
+  </data>
   <data name="Message_ConfirmClosing" xml:space="preserve">
     <value>設定が変更されています。保存しますか？
 [はい]を押すと変更を保存し終了します。

diff --git a/AupLauncher/Properties/Resources.resx b/AupLauncher/Properties/Resources.resx
@@ -193,6 +193,9 @@
   <data name="ER_Line8_Title" xml:space="preserve">
     <value>ER_Line8_Title {0}</value>
   </data>
+  <data name="Message_AnotherVersionInstalled" xml:space="preserve">
+    <value>Message_AnotherVersionInstalled</value>
+  </data>
   <data name="Message_ConfirmClosing" xml:space="preserve">
     <value>Message_ConfirmClosing</value>
   </data>

diff --git a/AupLauncher/Settings.cs b/AupLauncher/Settings.cs
@@ -84,6 +84,7 @@ public void SaveToRegistry()
 			if (this.IsDisposed) {
 				throw new ObjectDisposedException(nameof(Settings));
 			}
+			this.Default.DisplayName = Resources.DefaultProfileDisplayName; // TODO: 不具合の応急措置
 			_reg.SetValue("SavedVersion",   Program.Version, RegistryValueKind.String);
 			_reg.SetValue("DefaultProfile", _defkey,         RegistryValueKind.String);
 			var delList = new List<string>();

diff --git a/README.md b/README.md
@@ -48,6 +48,7 @@ Windows 10 (1909)
 ## バージョン履歴
 |バージョン|開発コード名|更新日    |内容                                                                                           |
 |:--------:|:----------:|:---------|:----------------------------------------------------------------------------------------------|
+|v0.0.0.7  |aupl00a7    |2020/04/11|別のバージョンがインストールされている時に、エラーを正しく処理する様にした。                   |
 |v0.0.0.6  |aupl00a6    |2020/04/04|無効なファイルの処理の「無効な値」を非表示にした。                                             |
 |v0.0.0.5  |aupl00a5    |2020/04/03|説明書きを分かり易く修正。                                                                     |
 |v0.0.0.4  |aupl00a4    |2020/03/31|ファイル名の空白を正しく処理する様にした。                                                     |
@@ -100,6 +101,7 @@ Please refer [LICENSE.txt](LICENSE.txt) for more information.
 ## Change Log
 |Version   |Code Name   |Update    |Changes                                                                                  |
 |:--------:|:----------:|:---------|:----------------------------------------------------------------------------------------|
+|v0.0.0.7  |aupl00a7    |2020/04/11|Fixed to handle an error when an another version is installed.                           |
 |v0.0.0.6  |aupl00a6    |2020/04/04|Invisibled the "invalid value" item of handles for an invalid file.                      |
 |v0.0.0.5  |aupl00a5    |2020/04/03|Fixed this manual friendly only.                                                         |
 |v0.0.0.4  |aupl00a4    |2020/03/31|Fixed to process for blanks in a file name.                                              |