Fix crash on exit

SysRay · Jun 13, 2024 · 35fd48e · 35fd48e
1 parent 5caebec
commit 35fd48e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/eventsystem/events/system_circle/intern/core.cpp b/eventsystem/events/system_circle/intern/core.cpp
@@ -57,7 +57,7 @@ struct PImplReader {
     });
   }
 
-  ~PImplReader() {}
+  ~PImplReader() { reader.join(); }
 };
 
 struct PImplWriter {

diff --git a/eventsystem/events/system_cross/intern/core.cpp b/eventsystem/events/system_cross/intern/core.cpp
@@ -57,7 +57,7 @@ struct PImplReader {
     });
   }
 
-  ~PImplReader() {}
+  ~PImplReader() { reader.join(); }
 };
 
 struct PImplWriter {

diff --git a/modules/external/libSceSystemService/entry.cpp b/modules/external/libSceSystemService/entry.cpp
@@ -131,8 +131,8 @@ EXPORT SYSV_ABI int32_t sceSystemServiceLoadExec(const char* path, char* const a
 
   auto fullpath = accessFileManager().getMappedPath(path);
   if (fullpath) {
-    auto apppath = accessFileManager().getMountPoint(MountType::App, "/app0/");
-    auto appupd  = accessFileManager().getMountPoint(MountType::Update, "/app1/");
+    auto apppath = accessFileManager().getMountPoint(MountType::App, MOUNT_POINT_APP.data());
+    auto appupd  = accessFileManager().getMountPoint(MountType::Update, MOUNT_POINT_UPDATE.data());
 
     events::system_circle::postEventLoadExec({fullpath->string().c_str(), apppath.string().c_str(), appupd.string().c_str()});
   } else {