From 5aa6daf58fbe78b22c4593881d1962fcd6a5abb2 Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Tue, 21 Apr 2015 22:43:40 +0300
Subject: [PATCH] Some code simplified

---
 rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp | 9 ++++++++-
 rpcs3/Loader/PSF.cpp                        | 8 ++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp
index be66a803cf..c42b02c802 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp
@@ -337,7 +337,14 @@ __noinline s32 savedata_op(
 
 		if (selected >= 0)
 		{
-			save_entry.dirName = std::move(save_entries[selected < save_entries.size() ? selected : throw __FUNCTION__].dirName);
+			if (selected < save_entries.size())
+			{
+				save_entry.dirName = std::move(save_entries[selected].dirName);
+			}
+			else
+			{
+				throw __FUNCTION__;
+			}
 		}
 	}
 
diff --git a/rpcs3/Loader/PSF.cpp b/rpcs3/Loader/PSF.cpp
index b67cbad97f..e6d78fdcae 100644
--- a/rpcs3/Loader/PSF.cpp
+++ b/rpcs3/Loader/PSF.cpp
@@ -127,11 +127,11 @@ bool PSFLoader::Save(vfsStream& stream) const
 	header.version = 0x101;
 	header.entries_num = static_cast<u32>(m_entries.size());
 	header.off_key_table = sizeof(PSFHeader) + sizeof(PSFDefTable) * header.entries_num;
-	header.off_data_table = header.off_key_table + [&]() -> u32
+
 	{
 		// calculate key table length and generate indices
 
-		u32 key_offset = 0;
+		u32& key_offset = header.off_data_table = 0;
 		u32 data_offset = 0;
 
 		for (u32 i = 0; i < m_entries.size(); i++)
@@ -161,9 +161,9 @@ bool PSFLoader::Save(vfsStream& stream) const
 			}
 			}
 		}
+	}
 
-		return key_offset;
-	}();
+	header.off_data_table += header.off_key_table;
 
 	// save header
 	if (!stream.SWrite(header))