TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-19 19:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

* BugFix: When querying against root with Torque::FS::DumpDirectories, correctly return directories with their path.

Browse source 
* Adjustment: Add commenting to some of the new programming.
* Adjustment: Tweak fileCreatedTime and fileModifiedTime functions to use the VFS.
This commit is contained in:
Robert MacGregor 2021-12-20 19:26:32 -05:00
parent b63122ea76
commit 0e93373824
7 changed files with 77 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/windowManager/sdl/sdlWindowMgr.cpp
View file

@ -52,8 +52,7 @@ PlatformWindowManagerSDL::DragAndDropFSInfo::DragAndDropFSInfo(String rootName,
PlatformWindowManagerSDL::DragAndDropFSInfo::~DragAndDropFSInfo()
{
// FIXME: Cleanup - we can't simply do this unmount due to the way the hash mapping works
// Torque::FS::Unmount(mDragAndDropFS);
}
#endif
@ -88,6 +87,15 @@ PlatformWindowManagerSDL::PlatformWindowManagerSDL()
PlatformWindowManagerSDL::~PlatformWindowManagerSDL()
{
// Unmount all drag and drop FS mounts
for (auto iteration = mActiveDragAndDropFSByPath.begin(); iteration != mActiveDragAndDropFSByPath.end(); ++iteration)
{
auto&& mapping = *iteration;
Torque::FS::Unmount(mapping.value.mDragAndDropFS);
}
mActiveDragAndDropByRoot.clear();
mActiveDragAndDropFSByPath.clear();
// Kill all our windows first.
while(mWindowListHead)
// The destructors update the list, so this works just fine.
@ -473,7 +481,7 @@ void PlatformWindowManagerSDL::_process()
while (search != mActiveDragAndDropByRoot.end())
{
char buffer[32];
dSprintf(buffer, 32, "%u", rootCounter);
dSprintf(buffer, sizeof(buffer), "%u", rootCounter);
chosenRootName = directoryName + buffer;
search = mActiveDragAndDropByRoot.find(chosenRootName);