Minor fixes

jongough · Nov 15, 2017 · d2d2571 · d2d2571
1 parent d99b000
commit d2d2571
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,7 @@ SET(CPACK_PACKAGE_CONTACT "Jon Gough")
 
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "16")
+SET(VERSION_PATCH "17")
 SET(VERSION_DATE "16/11/2017")
 
 SET(BUNDLE_DATA FALSE)

diff --git a/src/ODNavObjectChanges.cpp b/src/ODNavObjectChanges.cpp
@@ -1201,6 +1201,16 @@ ODPoint * ODNavObjectChanges::GPXLoadODPoint1( pugi::xml_node &opt_node,
         pOP->m_lon = rlon;
         pOP->m_IconName = SymString;
         pOP->SetName( NameString );
+        pOP->SetMarkDescription( DescString );
+        pOP->m_sTypeString = TypeString;
+        pOP->SetODPointArrivalRadius( ArrivalRadius );
+        pOP->SetODPointRangeRingsNumber( l_iODPointRangeRingsNumber );
+        pOP->SetODPointRangeRingsStep( l_fODPointRangeRingsStep );
+        pOP->SetODPointRangeRingsStepUnits( l_pODPointRangeRingsStepUnits );
+        pOP->SetShowODPointRangeRings( l_bODPointRangeRingsVisible );
+        pOP->SetODPointRangeRingsColour( l_wxcODPointRangeRingsColour );
+        pOP->SetODPointRangeRingWidth( l_iODPointRangeRingWidth );
+        pOP->SetODPointRangeRingStyle( l_iODPointRangeRingStyle );
     }
     if( pTP && TypeString == _T("Text Point") ) {
         pTP->SetPointText( TextString );
@@ -1227,16 +1237,6 @@ ODPoint * ODNavObjectChanges::GPXLoadODPoint1( pugi::xml_node &opt_node,
         pBP -> m_uiBoundaryPointFillTransparency = l_uiBoundaryPointFillTransparency;
     }
 
-    pOP->SetMarkDescription( DescString );
-    pOP->m_sTypeString = TypeString;
-    pOP->SetODPointArrivalRadius( ArrivalRadius );
-    pOP->SetODPointRangeRingsNumber( l_iODPointRangeRingsNumber );
-    pOP->SetODPointRangeRingsStep( l_fODPointRangeRingsStep );
-    pOP->SetODPointRangeRingsStepUnits( l_pODPointRangeRingsStepUnits );
-    pOP->SetShowODPointRangeRings( l_bODPointRangeRingsVisible );
-    pOP->SetODPointRangeRingsColour( l_wxcODPointRangeRingsColour );
-    pOP->SetODPointRangeRingWidth( l_iODPointRangeRingWidth );
-    pOP->SetODPointRangeRingStyle( l_iODPointRangeRingStyle );
 
     if( b_propvizname )
         pOP->m_bShowName = bviz_name;