Add MUI_LANGUAGE_NAME to wx/msw/missing.h.

[wxWidgets.git] / src / unix / dir.cpp

diff --git a/src/unix/dir.cpp b/src/unix/dir.cpp
index 9e71c8a40f46384a58e9363ad1cf4ba85b948c6c..f274a208d13cab0f64722ab5de49d3ec2cc0dd62 100644 (file)
--- a/src/unix/dir.cpp
+++ b/src/unix/dir.cpp
@@ -235,19 +235,26 @@ wxString wxDir::GetName() const
     if ( m_data )
     {
         name = M_DIR->GetName();
-        if ( !name.empty() && (name.Last() == wxT('/')) )
+
+        // Notice that we need to check for length > 1 as we shouldn't remove
+        // the last slash from the root directory!
+        if ( name.length() > 1 && (name.Last() == wxT('/')) )
         {
-            // chop off the last (back)slash
-            name.Truncate(name.length() - 1);
+            // chop off the last slash
+            name.RemoveLast();
         }
     }
 
     return name;
 }
 
-wxDir::~wxDir()
+void wxDir::Close()
 {
-    delete M_DIR;
+    if ( m_data )
+    {
+        delete m_data;
+        m_data = NULL;
+    }
 }
 
 // ----------------------------------------------------------------------------