チケット #38687 tar.gz 形式が 7-ZIP32.DLL がインストールされている環境下で正しく展開されない

[applistation/AppliStation.git] / AppliStation / PackageUninstallConfirmForm.cs

diff --git a/AppliStation/PackageUninstallConfirmForm.cs b/AppliStation/PackageUninstallConfirmForm.cs
index 2cc85fe..1abc56e 100644 (file)
--- a/AppliStation/PackageUninstallConfirmForm.cs
+++ b/AppliStation/PackageUninstallConfirmForm.cs
@@ -70,7 +70,8 @@ namespace AppliStation
                                return false;   \r
                        }\r
                        \r
-                       return (uninstallPackage.Type != InstallerType.ARCHIVE);\r
+                       return (uninstallPackage.Type != InstallerType.ARCHIVE)\r
+                               && (uninstallPackage.Type != InstallerType.ITSELF);\r
                }\r
                \r
                void RunasCheckBoxCheckedChanged(object sender, EventArgs e)\r
@@ -80,12 +81,7 @@ namespace AppliStation
                \r
                private void updateUseRunas()\r
                {\r
-                       if (UseRunas) {\r
-                               System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InstallationConfirmForm));\r
-                               okButton.Image = ((System.Drawing.Bitmap)(resources.GetObject("okButton.Image")));\r
-                       } else {\r
-                               okButton.Image = null;\r
-                       }\r
+                       AppliStation.Util.NativeMethods.Button_SetElevationRequiredState(okButton, UseRunas);\r
                }\r
                \r
                #endregion\r