Don't consider extra ".." an error in wxFileName::Normalize().

[wxWidgets.git] / src / xrc / xmlres.cpp

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index f24b8455c6f7e8f23e4051172a24752b1267bfe7..eebc913691f3b996ea4dcbced1222ca0ee6371d7 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -2641,16 +2641,14 @@ void wxIdRangeManager::RemoveXRCIDEntry(const wxString& idstr)
         if (wxStrcmp(rec->key, str_id) == 0)
         {
             // Found the item to be removed so delete its record; but first
         if (wxStrcmp(rec->key, str_id) == 0)
         {
             // Found the item to be removed so delete its record; but first

-            // replace it in the table with any rec->next (usually == NULL)
-            (*p_previousrec) = rec->next;
+            // remove it from the linked list.
+            *p_previousrec = rec->next;

             free(rec->key);
             delete rec;
             return;
         }
             free(rec->key);
             delete rec;
             return;
         }

-        else
-        {
-            p_previousrec = &rec;
-        }
+
+        p_previousrec = &rec->next;

     }
 }
 
     }
 }