bzr commit into wex-installer-1.0 branch (mike.lischke:450)

[Mike Lischke]

#At file:///D:/Work/MySQL/installer/ based on revid:iggy@stripped

  450 Mike Lischke	2011-05-02
      Keep user selection for the current architecture when switch forth and back between features page and installation progress page.

    modified:
      WexInstaller/InstallWizard/Features.cs
=== modified file 'WexInstaller/InstallWizard/Features.cs'
=== modified file 'WexInstaller/InstallWizard/Features.cs'
--- a/WexInstaller/InstallWizard/Features.cs	2011-04-18 08:06:38 +0000
+++ b/WexInstaller/InstallWizard/Features.cs	2011-05-02 09:39:50 +0000
@@ -103,7 +103,7 @@
       featureBox.FeatureTree = featureTree;
 
       // Hide the architecture selection box if we are on a 32 OS.
-      architectureCombobox.SelectedIndex = 0;
+      architectureCombobox.SelectedIndex = -1;
       if (!Win32.Is64BitOS())
       {
         architectureCombobox.Visible = false;
@@ -124,8 +124,13 @@
       if (ProductManager.ActiveCatalog != null)
       {
         currentCatalogName = ProductManager.ActiveCatalog.Name;
-        if (ProductManager.ActiveCatalog.Requires64BitArchitecture)
-          architectureCombobox.SelectedIndex = 1;
+        if (architectureCombobox.SelectedIndex == -1)
+        {
+          if (ProductManager.ActiveCatalog.Requires64BitArchitecture)
+            architectureCombobox.SelectedIndex = 1;
+          else
+            architectureCombobox.SelectedIndex = 0;
+        }
       }
 
       int selectedIndex = catalogList.SelectedIndex;


Attachment: [text/bzr-bundle] bzr/[e-mail]