List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:February 2 2011 4:40pm
Subject:bzr commit into wex-installer-1.0 branch (reggie.burnett:285)
View as plain text  
#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:reggie.burnett@stripped

  285 Reggie Burnett	2011-02-02
      small change to pre-load the controller after install

    modified:
      WexInstaller/InstallWizard/AllConfigOverview.cs
      WexInstaller/InstallWizard/InstallProgressPanel.cs
=== modified file 'WexInstaller/InstallWizard/AllConfigOverview.cs'
=== modified file 'WexInstaller/InstallWizard/AllConfigOverview.cs'
--- a/WexInstaller/InstallWizard/AllConfigOverview.cs	2011-01-31 16:46:34 +0000
+++ b/WexInstaller/InstallWizard/AllConfigOverview.cs	2011-02-02 16:40:59 +0000
@@ -46,14 +46,15 @@
                 {
                     foreach (Product p in pc.Products)
                     {
-                        if (p.Controller == null || p.CurrentState != ProductState.InstallSuccess)
-                            continue;
-                        ListViewItem item = new ListViewItem(String.Empty);
-                        item.Name = p.Title;
-                        item.Tag = p;
-                        item.SubItems.Add(p.TitleWithVersion);
-                        item.SubItems.Add(GetProductStateString(p.Controller.CurrentState));
-                        productList.Items.Add(item);
+                        if (p.CurrentState == ProductState.InstallSuccess && p.Controller != null)
+                        {
+                            ListViewItem item = new ListViewItem(String.Empty);
+                            item.Name = p.Title;
+                            item.Tag = p;
+                            item.SubItems.Add(p.TitleWithVersion);
+                            item.SubItems.Add(GetProductStateString(p.Controller.CurrentState));
+                            productList.Items.Add(item);
+                        }
                     }
                 }
             }

=== modified file 'WexInstaller/InstallWizard/InstallProgressPanel.cs'
--- a/WexInstaller/InstallWizard/InstallProgressPanel.cs	2011-01-23 17:51:26 +0000
+++ b/WexInstaller/InstallWizard/InstallProgressPanel.cs	2011-02-02 16:40:59 +0000
@@ -279,6 +279,7 @@
                     installingItem = item;
                     p.ProductInstallationProgressChanged += new ProductInstationActionEventHandler(ProductInstallationProgressChanged);
                     p.MakeChanges();
+                    object o = p.Controller;
                     return;
                 }
                 Application.DoEvents();


Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110202164059-c2jyv85jywkewzz0.bundle
Thread
bzr commit into wex-installer-1.0 branch (reggie.burnett:285) Reggie Burnett2 Feb