diff --git a/Source/Engine/Platform/Windows/WindowsFileSystem.cpp b/Source/Engine/Platform/Windows/WindowsFileSystem.cpp index 83f042730..38384f05f 100644 --- a/Source/Engine/Platform/Windows/WindowsFileSystem.cpp +++ b/Source/Engine/Platform/Windows/WindowsFileSystem.cpp @@ -316,7 +316,8 @@ bool WindowsFileSystem::ShowBrowseFolderDialog(Window* parentWindow, const Strin if (SUCCEEDED(SHCreateItemFromParsingName(initialDirectory.Get(), NULL, IID_PPV_ARGS(&defaultFolder)))) fd->SetFolder(defaultFolder); - if (SUCCEEDED(fd->Show(parentWindow->GetHWND()))) + HWND hwndOwner = parentWindow ? parentWindow->GetHWND() : NULL; + if (SUCCEEDED(fd->Show(hwndOwner))) { ComPtr si; if (SUCCEEDED(fd->GetResult(&si)))