From bcb9ad94c1bf73770957bd6977df7ab7de8bcbd1 Mon Sep 17 00:00:00 2001
From: Peter Tissen <dravorek@gmail.com>
Date: Tue, 1 Apr 2014 19:19:51 +0200
Subject: [PATCH] correct some merge error that happened from automatic git
 merging

---
 rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp
index 1e9a2f8375..61da3e60b9 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp
@@ -174,7 +174,7 @@ void getSaveDataStat(SaveDataListEntry entry, mem_ptr_t<CellSaveDataStatGet> sta
 			fileEntry.st_atime_ = 0; // TODO ?
 			fileEntry.st_mtime_ = 0; // TODO ?
 			fileEntry.st_ctime_ = 0; // TODO ?
-			memcpy(fileEntry.fileName, (const char*)dirEntry->name.mb_str(), CELL_SAVEDATA_FILENAME_SIZE);
+			memcpy(fileEntry.fileName, dirEntry->name.c_str(), CELL_SAVEDATA_FILENAME_SIZE);
 
 			fileEntries.push_back(fileEntry);
 		}