Fix local saves with "." having their name cut off, add a warning for…

… a few invalid file names
The-Powder-Toy · Feb 20, 2019 · 646935e · 646935e
1 parent 16d686e
commit 646935e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/gui/filebrowser/FileBrowserActivity.cpp b/src/gui/filebrowser/FileBrowserActivity.cpp
@@ -69,7 +69,7 @@ class LoadFilesTask: public Task
 				saveFiles.push_back(saveFile);
 
 				ByteString filename = (*iter).SplitFromEndBy(PATH_SEP).After();
-				filename = filename.SplitBy('.').Before();
+				filename = filename.SplitFromEndBy('.').Before();
 				saveFile->SetDisplayName(filename.FromUtf8());
 			}
 			catch(std::exception & e)

diff --git a/src/gui/save/LocalSaveActivity.cpp b/src/gui/save/LocalSaveActivity.cpp
@@ -90,7 +90,11 @@ void LocalSaveActivity::Save()
 		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";
 		save.SetDisplayName(filenameField->GetText());