From 57823f91774e4c52fa46e064f6b75b59e6e3957f Mon Sep 17 00:00:00 2001 From: thrust26 Date: Tue, 5 Jan 2021 10:53:06 +0100 Subject: [PATCH] Revert "attempted to fix special char problems in Windows (see #751)" This reverts commit c0647d7a225c9390a07a7a5485d63bc8ecb76c66. --- src/windows/FSNodeWINDOWS.cxx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/windows/FSNodeWINDOWS.cxx b/src/windows/FSNodeWINDOWS.cxx index 1c8880272..bc4212ddd 100644 --- a/src/windows/FSNodeWINDOWS.cxx +++ b/src/windows/FSNodeWINDOWS.cxx @@ -93,13 +93,8 @@ void FilesystemNodeWINDOWS::addFile(AbstractFSList& list, ListMode mode, { FilesystemNodeWINDOWS entry; char* asciiName = toAscii(find_data->cFileName); - // Use short 8.3 name for the path to handle special chars - char* shortAsciiName = toAscii(find_data->cAlternateFileName); bool isDirectory, isFile; - if(!strlen(shortAsciiName)) - shortAsciiName = asciiName; - // Skip local directory (.) and parent (..) if(!strncmp(asciiName, ".", 1) || !strncmp(asciiName, "..", 2)) return; @@ -115,7 +110,7 @@ void FilesystemNodeWINDOWS::addFile(AbstractFSList& list, ListMode mode, entry._isFile = isFile; entry._displayName = asciiName; entry._path = base; - entry._path += shortAsciiName; + entry._path += asciiName; if(entry._isDirectory) entry._path += "\\"; entry._isValid = true;