From fb3fcfcdb7cbcdd5cdf1df9da6ee76d47c95f9ec Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Sun, 4 Jul 2021 14:35:25 -0400
Subject: [PATCH] Fix local saves and migration process on Windows

---
 src/common/Platform.cpp                     | 4 ++--
 src/gui/filebrowser/FileBrowserActivity.cpp | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/common/Platform.cpp b/src/common/Platform.cpp
index 775d52f2e..c313586ff 100644
--- a/src/common/Platform.cpp
+++ b/src/common/Platform.cpp
@@ -307,8 +307,8 @@ std::vector<ByteString> DirectorySearch(ByteString directory, ByteString search,
 	do
 	{
 		ByteString currentFileName = Platform::WinNarrow(currentFile.name);
-		if (currentFileName.length()>4)
-			directoryList.push_back(directory+currentFileName);
+		if (currentFileName.length() > 4)
+			directoryList.push_back(currentFileName);
 	}
 	while (_wfindnext(findFileHandle, &currentFile) == 0);
 	_findclose(findFileHandle);
diff --git a/src/gui/filebrowser/FileBrowserActivity.cpp b/src/gui/filebrowser/FileBrowserActivity.cpp
index cf7552a97..4270e12fc 100644
--- a/src/gui/filebrowser/FileBrowserActivity.cpp
+++ b/src/gui/filebrowser/FileBrowserActivity.cpp
@@ -48,6 +48,8 @@ class LoadFilesTask: public Task
 			try
 			{
 				std::vector<unsigned char> data = Client::Ref().ReadFile(directory + *iter);
+				if (data.empty())
+					continue;
 				GameSave * tempSave = new GameSave(data);
 				saveFile->SetGameSave(tempSave);
 				saveFiles.push_back(saveFile);