OSDN Git Service

Fix issue #1852: Silent install blocked
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Mon, 15 May 2023 14:05:52 +0000 (23:05 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Mon, 15 May 2023 14:05:52 +0000 (23:05 +0900)
Installer/InnoSetup/WinMergeARM64.is6.iss
Installer/InnoSetup/WinMergeX64.is6.iss
Installer/InnoSetup/WinMergeX64.iss
Installer/InnoSetup/WinMergeX64NonAdmin.iss
Installer/InnoSetup/WinMergeX86.iss

index 1920a6d..2e33811 100644 (file)
@@ -882,7 +882,7 @@ Begin
 
                     {Display a dialog asking the user if they'd like to delete the previous start menu group}
                     {If they'd like to delete the previous start menu group then...}
-                    If Msgbox(strMessage, mbConfirmation, mb_YesNo) = mrYes Then
+                    If SuppressibleMsgbox(strMessage, mbConfirmation, mb_YesNo, mrYes) = mrYes Then
                         Begin
                             strOld := ExpandConstant('{commonprograms}\') + strOld;
                             {Remove old start menu}
index cf345a4..064387b 100644 (file)
@@ -881,7 +881,7 @@ Begin
 \r
                     {Display a dialog asking the user if they'd like to delete the previous start menu group}\r
                     {If they'd like to delete the previous start menu group then...}\r
-                    If Msgbox(strMessage, mbConfirmation, mb_YesNo) = mrYes Then\r
+                    If SuppressibleMsgbox(strMessage, mbConfirmation, mb_YesNo, mrYes) = mrYes Then\r
                         Begin\r
                             strOld := ExpandConstant('{commonprograms}\') + strOld;\r
                             {Remove old start menu}\r
index ba401b3..d685eba 100644 (file)
@@ -862,7 +862,7 @@ Begin
 \r
                     {Display a dialog asking the user if they'd like to delete the previous start menu group}\r
                     {If they'd like to delete the previous start menu group then...}\r
-                    If Msgbox(strMessage, mbConfirmation, mb_YesNo) = mrYes Then\r
+                    If SuppressibleMsgbox(strMessage, mbConfirmation, mb_YesNo, mrYes) = mrYes Then\r
                         Begin\r
                             strOld := ExpandConstant('{commonprograms}\') + strOld;\r
                             {Remove old start menu}\r
index 432ce3c..6992b36 100644 (file)
@@ -860,7 +860,7 @@ Begin
 
                     {Display a dialog asking the user if they'd like to delete the previous start menu group}
                     {If they'd like to delete the previous start menu group then...}
-                    If Msgbox(strMessage, mbConfirmation, mb_YesNo) = mrYes Then
+                    If SuppressibleMsgbox(strMessage, mbConfirmation, mb_YesNo, mrYes) = mrYes Then
                         Begin
                             strOld := ExpandConstant('{commonprograms}\') + strOld;
                             {Remove old start menu}
index db73eaa..9cf534f 100755 (executable)
@@ -882,7 +882,7 @@ Begin
 \r
                     {Display a dialog asking the user if they'd like to delete the previous start menu group}\r
                     {If they'd like to delete the previous start menu group then...}\r
-                    If Msgbox(strMessage, mbConfirmation, mb_YesNo) = mrYes Then\r
+                    If SuppressibleMsgbox(strMessage, mbConfirmation, mb_YesNo, mrYes) = mrYes Then\r
                         Begin\r
                             strOld := ExpandConstant('{commonprograms}\') + strOld;\r
                             {Remove old start menu}\r