Changeset 1260

Timestamp:

1/20/2010 4:59:30 AM (8 weeks ago)

Author:

vessper

Message:

20/01/2010

---

- Prism: Fix for corp hangar mode not calculating hangar prices when using standard stations

Location:

trunk/EveHQ.Prism

Files:

• Forms/frmPrism.vb (modified) (3 diffs)
• My Project/AssemblyInfo.vb (modified) (1 diff)

trunk/EveHQ.Prism/Forms/frmPrism.vb

@@ -836 +836 @@
                     Dim locList As XmlNodeList
                     Dim loc As XmlNode
-                    Dim AssetIsInHanger As Boolean = False
-                    Dim hangarPrice As Double = 0
                     locList = assetXML.SelectNodes("/eveapi/result/rowset/row")
                     If locList.Count > 0 Then
                         Dim linePrice As Double = 0
                         Dim containerPrice As Double = 0
+                        Dim AssetIsInHanger As Boolean = False
+                        Dim hangarPrice As Double = 0
                         For Each loc In locList
                             ' Check if the location is already listed
@@ -1020 +1020 @@
                             newAsset.SubItems(AssetColumn.Value).Text = FormatNumber(linePrice, 2, TriState.UseDefault, TriState.UseDefault, TriState.UseDefault)
 
-                            ' Update hangar price if applicable
-                            If AssetIsInHanger = True Then
-                                hangarPrice = CDbl(newAsset.ParentItem.SubItems(AssetColumn.Value).Text)
-                                newAsset.ParentItem.SubItems(AssetColumn.Value).Text = FormatNumber(hangarPrice + linePrice, 2)
-                            End If
-
                             ' Add the asset to the list of assets
                             Dim newAssetList As New AssetItem
@@ -1044 +1038 @@
                             If loc.HasChildNodes = True Then
                                 Call Me.PopulateAssetNode(newAsset, loc, owner, locNode.Text, selPilot)
+                            End If
+
+                            ' Update hangar price if applicable
+                            If AssetIsInHanger = True Then
+                                hangarPrice = CDbl(newAsset.ParentItem.SubItems(AssetColumn.Value).Text)
+                                newAsset.ParentItem.SubItems(AssetColumn.Value).Text = FormatNumber(hangarPrice + CDbl(newAsset.SubItems(AssetColumn.Value).Text), 2)
                             End If
                         Next

trunk/EveHQ.Prism/My Project/AssemblyInfo.vb

@@ -32 +32 @@
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.14.0.1257")> 
-<Assembly: AssemblyFileVersion("1.14.0.1257")> 
+<Assembly: AssemblyVersion("1.14.0.1260")> 
+<Assembly: AssemblyFileVersion("1.14.0.1260")>