Skip to content

Commit 146627a

Browse files
committed
Workaround for freezing installer wizard during upgrade
If the user installs xPilot in the root X-Plane folder (bad!) then the installer freezes because it is trying to add all X-Plane files to the uninstaller. Check if the chosen folder contains X-Plane.exe, if so, stop the user and make them choose a different folder.
1 parent 0e007b1 commit 146627a

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

installer/windows.xml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,6 @@
231231
<name>xplane12path</name>
232232
<value>${xplane12path}</value>
233233
</setInstallerVariable>
234-
<setInstallerVariable>
235-
<name>project.parameter(installdir).ask</name>
236-
<value>0</value>
237-
<ruleList>
238-
<fileTest condition="exists" path="${installdir}"/>
239-
</ruleList>
240-
</setInstallerVariable>
241234
<setInstallerVariable>
242235
<name>isUpgradeMode</name>
243236
<value>1</value>
@@ -477,6 +470,20 @@ ADVANCED USERS: If X-Plane 11 is not installed on this computer, leave the folde
477470
<mustBeWritable>1</mustBeWritable>
478471
<mustExist>0</mustExist>
479472
<width>40</width>
473+
<validationActionList>
474+
<throwError>
475+
<text>Error: Installing xPilot in the root X-Plane folder is not recommended. Please choose a different folder to install xPilot.
476+
477+
The recommended installation path folder is:
478+
479+
${platform_install_prefix}\${product_fullname}
480+
</text>
481+
<ruleList>
482+
<fileExists negate="0" path="${installdir}/X-Plane.exe"/>
483+
<platformTest type="windows"/>
484+
</ruleList>
485+
</throwError>
486+
</validationActionList>
480487
</directoryParameter>
481488
</parameterList>
482489
</project>

0 commit comments

Comments
 (0)