matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix local saves with "." having their name cut off, add a warning for a few invalid file names

Browse Source
This commit is contained in:
jacob1 2019-02-19 23:24:39 -05:00
parent 16d686e949
commit 646935edb3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/filebrowser/FileBrowserActivity.cpp
View File

@ -69,7 +69,7 @@ class LoadFilesTask: public Task
saveFiles.push_back(saveFile); saveFiles.push_back(saveFile);
ByteString filename = (*iter).SplitFromEndBy(PATH_SEP).After(); ByteString filename = (*iter).SplitFromEndBy(PATH_SEP).After();
filename = filename.SplitBy('.').Before(); filename = filename.SplitFromEndBy('.').Before();
saveFile->SetDisplayName(filename.FromUtf8()); saveFile->SetDisplayName(filename.FromUtf8());
} }
catch(std::exception & e) catch(std::exception & e)

6
src/gui/save/LocalSaveActivity.cpp
View File

@ -90,7 +90,11 @@ void LocalSaveActivity::Save()
virtual ~FileOverwriteConfirmation() { } virtual ~FileOverwriteConfirmation() { }
}; };
if(filenameField->GetText().length()) if (filenameField->GetText().Contains('/') || filenameField->GetText().BeginsWith("."))
{
new ErrorMessage("Error", "Invalid filename.");
}
else if (filenameField->GetText().length())
{ {
ByteString finalFilename = ByteString(LOCAL_SAVE_DIR) + ByteString(PATH_SEP) + filenameField->GetText().ToUtf8() + ".cps"; ByteString finalFilename = ByteString(LOCAL_SAVE_DIR) + ByteString(PATH_SEP) + filenameField->GetText().ToUtf8() + ".cps";
save.SetDisplayName(filenameField->GetText()); save.SetDisplayName(filenameField->GetText());