Forgot to unset m_relative in wxFilename::Normalize().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 2bb2b0be196d4673e22b3859d5334028604946a5..9a63058af1e5cc16daffdf680b49bc8834f5a329 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -728,6 +728,7 @@ bool wxFileName::Normalize(wxPathNormalize flags,
             }
         }
 #endif
+        m_relative = FALSE;
     }
 
     // handle ~ stuff under Unix only
@@ -1090,18 +1091,18 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const
     // first put the volume
     if ( !m_volume.empty() )
     {
-       {
-               // Special Windows UNC paths hack, part 2: undo what we did in
-               // SplitPath() and make an UNC path if we have a drive which is not a
-               // single letter (hopefully the network shares can't be one letter only
-               // although I didn't find any authoritative docs on this)
-               if ( format == wxPATH_DOS && m_volume.length() > 1 )
-               {
-               fullpath << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_DOS << m_volume;
-               }
-               else if  ( format == wxPATH_DOS || format == wxPATH_VMS )
-               {
-               fullpath << m_volume << GetVolumeSeparator(format);
+        {
+            // Special Windows UNC paths hack, part 2: undo what we did in
+            // SplitPath() and make an UNC path if we have a drive which is not a
+            // single letter (hopefully the network shares can't be one letter only
+            // although I didn't find any authoritative docs on this)
+            if ( format == wxPATH_DOS && m_volume.length() > 1 )
+            {
+                fullpath << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_DOS << m_volume;
+            }
+            else if  ( format == wxPATH_DOS || format == wxPATH_VMS )
+            {
+                fullpath << m_volume << GetVolumeSeparator(format);
             }
             // else ignore
         }