Используем функцию PathIsRootW вместо метода CPath::IsRoot.

Aleksoid1978 · Sep 12, 2024 · 2b1a962 · 2b1a962
1 parent 46c46ce
commit 2b1a962
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/DSUtil/FileHandle.cpp b/src/DSUtil/FileHandle.cpp
@@ -33,6 +33,7 @@
 // PathFileExistsW
 // PathFindExtensionW
 // PathIsDirectoryW
+// PathIsRootW
 // PathRemoveBackslashW
 // PathRemoveFileSpecW
 // PathStripPathW

diff --git a/src/apps/mplayerc/PlayerPlaylistBar.cpp b/src/apps/mplayerc/PlayerPlaylistBar.cpp
@@ -312,11 +312,11 @@ static bool FindFileInList(std::list<T>& sl, const CString& fn)
  return false;
 }
 
-static void StringToPaths(const CString& curentdir, const CString& str, std::vector<CString>& paths)
+static void StringToPaths(const CStringW& curentdir, const CStringW& str, std::vector<CStringW>& paths)
 {
  int pos = 0;
  do {
- CString s = str.Tokenize(L";", pos);
+ CStringW s = str.Tokenize(L";", pos);
  if (s.GetLength() == 0) {
  continue;
  }
@@ -326,10 +326,9 @@ static void StringToPaths(const CString& curentdir, const CString& str, std::vec
  continue; // the asterisk can only be in the last folder
  }
 
- CPath path(curentdir);
- path.Append(s);
+ CStringW path = GetCombineFilePath(curentdir, s);
 
- if (path.IsRoot() && path.FileExists()) {
+ if (::PathIsRootW(path) && ::PathFileExistsW(path)) {
  paths.emplace_back(path);
  continue;
  }