summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/file_sys/disk_filesystem.cpp6
-rw-r--r--src/core/hle/kernel/hle_ipc.cpp4
2 files changed, 6 insertions, 4 deletions
diff --git a/src/core/file_sys/disk_filesystem.cpp b/src/core/file_sys/disk_filesystem.cpp
index 8c6f15bb5..d248c2df4 100644
--- a/src/core/file_sys/disk_filesystem.cpp
+++ b/src/core/file_sys/disk_filesystem.cpp
@@ -58,11 +58,13 @@ ResultVal<std::unique_ptr<StorageBackend>> Disk_FileSystem::OpenFile(const std::
58} 58}
59 59
60ResultCode Disk_FileSystem::DeleteFile(const std::string& path) const { 60ResultCode Disk_FileSystem::DeleteFile(const std::string& path) const {
61 if (!FileUtil::Exists(path)) { 61 std::string full_path = base_directory + path;
62
63 if (!FileUtil::Exists(full_path)) {
62 return ERROR_PATH_NOT_FOUND; 64 return ERROR_PATH_NOT_FOUND;
63 } 65 }
64 66
65 FileUtil::Delete(path); 67 FileUtil::Delete(full_path);
66 68
67 return RESULT_SUCCESS; 69 return RESULT_SUCCESS;
68} 70}
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp
index 609cdbff2..2532dd450 100644
--- a/src/core/hle/kernel/hle_ipc.cpp
+++ b/src/core/hle/kernel/hle_ipc.cpp
@@ -214,8 +214,8 @@ ResultCode HLERequestContext::WriteToOutgoingCommandBuffer(Thread& thread) {
214 (sizeof(IPC::CommandHeader) + sizeof(IPC::HandleDescriptorHeader)) / sizeof(u32); 214 (sizeof(IPC::CommandHeader) + sizeof(IPC::HandleDescriptorHeader)) / sizeof(u32);
215 ASSERT_MSG(!handle_descriptor_header->send_current_pid, "Sending PID is not implemented"); 215 ASSERT_MSG(!handle_descriptor_header->send_current_pid, "Sending PID is not implemented");
216 216
217 ASSERT_MSG(copy_objects.size() == handle_descriptor_header->num_handles_to_copy); 217 ASSERT(copy_objects.size() == handle_descriptor_header->num_handles_to_copy);
218 ASSERT_MSG(move_objects.size() == handle_descriptor_header->num_handles_to_move); 218 ASSERT(move_objects.size() == handle_descriptor_header->num_handles_to_move);
219 219
220 // We don't make a distinction between copy and move handles when translating since HLE 220 // We don't make a distinction between copy and move handles when translating since HLE
221 // services don't deal with handles directly. However, the guest applications might check 221 // services don't deal with handles directly. However, the guest applications might check