| Index: core/fxge/ge/cfx_folderfontinfo.cpp
|
| diff --git a/core/fxge/ge/cfx_folderfontinfo.cpp b/core/fxge/ge/cfx_folderfontinfo.cpp
|
| index 31608bdf3aafc4331c16d1e349e21e239cdcadeb..393f74bbd9594c0d3add7c55f22ea4c2efbe0c56 100644
|
| --- a/core/fxge/ge/cfx_folderfontinfo.cpp
|
| +++ b/core/fxge/ge/cfx_folderfontinfo.cpp
|
| @@ -116,13 +116,13 @@ FX_BOOL CFX_FolderFontInfo::EnumFontList(CFX_FontMapper* pMapper) {
|
| }
|
|
|
| void CFX_FolderFontInfo::ScanPath(const CFX_ByteString& path) {
|
| - void* handle = FX_OpenFolder(path.c_str());
|
| + FX_FileHandle* handle = FX_OpenFolder(path.c_str());
|
| if (!handle)
|
| return;
|
|
|
| CFX_ByteString filename;
|
| - FX_BOOL bFolder;
|
| - while (FX_GetNextFile(handle, filename, bFolder)) {
|
| + bool bFolder;
|
| + while (FX_GetNextFile(handle, &filename, &bFolder)) {
|
| if (bFolder) {
|
| if (filename == "." || filename == "..")
|
| continue;
|
|
|