Merge pull request #382 from q4a/profile-fix

espkk · web-flow · commit b9f7c476caf8 · 2022-07-10T12:21:12.000+03:00
Fix XI_FindFolders in Linux
diff --git a/src/libs/xinterface/src/string_service/str_service.cpp b/src/libs/xinterface/src/string_service/str_service.cpp
@@ -1356,7 +1356,7 @@ uint32_t _InterfaceFindFolders(VS_STACK *pS)
         return IFUNCRESULT_FAILED;
     }
     const char *sFindTemplate = pDat->GetString();
-    std::filesystem::path p = std::filesystem::u8path(sFindTemplate);
+    std::filesystem::path p = std::filesystem::u8path(fio->ConvertPathResource(sFindTemplate));
     const auto mask = p.filename().string();
     const auto vFilenames =
         fio->_GetPathsOrFilenamesByMask(p.remove_filename().string().c_str(), mask.c_str(), false, true, false);

Original file line number	Diff line number	Diff line change
`@@ -1356,7 +1356,7 @@ uint32_t _InterfaceFindFolders(VS_STACK *pS)`
`1356`	`1356`	`return IFUNCRESULT_FAILED;`
`1357`	`1357`	`}`
`1358`	`1358`	`const char *sFindTemplate = pDat->GetString();`
`1359`		`- std::filesystem::path p = std::filesystem::u8path(sFindTemplate);`
	`1359`	`+ std::filesystem::path p = std::filesystem::u8path(fio->ConvertPathResource(sFindTemplate));`
`1360`	`1360`	`const auto mask = p.filename().string();`
`1361`	`1361`	`const auto vFilenames =`
`1362`	`1362`	`fio->_GetPathsOrFilenamesByMask(p.remove_filename().string().c_str(), mask.c_str(), false, true, false);`