TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adds handling to winVolume's _BuildFileName so if it's a filename-less filename(has only extension but no name) then we process the filename string correctly

Browse source 
Adds logic so when trying to do a path copy, if it's not a valid source filename, we merely fail the copy, rather than crashing due to a nullref
Makes guiPopUpCtrlEx respect the mActive flag so the mouse cannot interact with it if it's inactive
This commit is contained in:
Areloch 2022-07-24 13:12:46 -05:00
parent 0df6d7fed9
commit dbf60a95a2
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/core/volume.cpp
View file

@ -579,6 +579,9 @@ bool MountSystem::copyFile(const Path& source, const Path& destination, bool noO
}
FileRef sourceFile = openFile(source, FS::File::AccessMode::Read);
if (!sourceFile)
return false;
const U64 sourceFileSize = sourceFile->getSize();
void* writeBuffer = dMalloc(sourceFileSize);

3
Engine/source/gui/controls/guiPopUpCtrlEx.cpp
View file

@ -1386,6 +1386,9 @@ bool GuiPopUpMenuCtrlEx::onKeyDown(const GuiEvent &event)
//------------------------------------------------------------------------------
void GuiPopUpMenuCtrlEx::onAction()
{
if (!mActive)
return;
GuiControl *canCtrl = getParent();
addChildren();

5
Engine/source/platformWin32/winVolume.cpp
View file

@ -89,7 +89,10 @@ static String _BuildFileName(const String& prefix,const Path& path)
// internal path name.
String file = prefix;
file = Path::Join(file, '/', path.getPath());
file = Path::Join(file, '/', path.getFileName());
if (path.getFileName().isEmpty() && path.getExtension().isNotEmpty()) //weird, filename-less file, so handle it slightly special-case
file += String("/");
else
file = Path::Join(file, '/', path.getFileName());
file = Path::Join(file, '.', path.getExtension());
return file;
}