Merge pull request #560 from jongough/updates

Updates
jongough · Oct 23, 2024 · 610df30 · 610df30
2 parents 856211f + d946c47
commit 610df30
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,9 +60,9 @@ set(PACKAGE "ocpn_draw")
 
 set(VERSION_MAJOR "1")
 set(VERSION_MINOR "8")
-set(VERSION_PATCH "55")
+set(VERSION_PATCH "56")
 set(VERSION_TWEAK "0")
-set(VERSION_DATE "20/10/2024") # DD/MM/YYYY format
+set(VERSION_DATE "23/10/2024") # DD/MM/YYYY format
 set(OCPN_MIN_VERSION "ov50")
 set(OCPN_API_VERSION_MAJOR "1")
 set(OCPN_API_VERSION_MINOR "17")

diff --git a/src/ODNavObjectChanges.cpp b/src/ODNavObjectChanges.cpp
@@ -1203,7 +1203,7 @@ ODPoint * ODNavObjectChanges::GPXLoadODPoint1( pugi::xml_node &opt_node,
     if(!pOP)
         pOP = ODPointExists( GuidString );
     if(pOP && b_layer)
-        return NULL; // dont import if in a layer and ODPoint already exists
+        return pOP; // dont import if in a layer and ODPoint already exists
 
     if( !pOP ) {
         if( TypeString == wxT("Text Point") ) {
@@ -1378,7 +1378,6 @@ ODPath *ODNavObjectChanges::GPXLoadPath1( pugi::xml_node &odpoint_node  , bool b
 
         if( ChildName == _T ( "opencpn:ODPoint" ) ) {
             ODPoint *tpOp = GPXLoadODPoint1(  tschild, _T("square"), _T(""), b_fullviz, b_layer, b_layerviz, layer_id, true );
-
             pTentPath->AddPoint( tpOp, false, true, true);          // defer BBox calculation
             if(pTentBoundary) {
                 BoundaryPoint *l_pBP = dynamic_cast<BoundaryPoint *>(tpOp);