From 9b0fcdf473b623cf66479d8195c1429cf000059c Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Sat, 27 Aug 2022 14:07:43 +0200
Subject: [PATCH] Use latest librpxloader version

---
 Dockerfile   |  6 +++---
 src/main.cpp | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4f90cbc..ef0f9ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM wiiuenv/devkitppc:20220724
+FROM wiiuenv/devkitppc:20220806
 
-COPY --from=wiiuenv/wiiupluginsystem:20220724 /artifacts $DEVKITPRO
-COPY --from=wiiuenv/librpxloader:20220724 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/wiiupluginsystem:20220826 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/librpxloader:20220825 /artifacts $DEVKITPRO
 COPY --from=wiiuenv/libsdutils:20220724 /artifacts $DEVKITPRO
 COPY --from=wiiuenv/libwuhbutils:20220724 /artifacts $DEVKITPRO
 COPY --from=wiiuenv/libcontentredirection:20220724 /artifacts $DEVKITPRO
diff --git a/src/main.cpp b/src/main.cpp
index d1746bc..d62060b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -78,7 +78,7 @@ INITIALIZE_PLUGIN() {
 
     // Use librpxloader.
     RPXLoaderStatus error3;
-    if ((error3 = RPXLoader_Init()) != RPX_LOADER_RESULT_SUCCESS) {
+    if ((error3 = RPXLoader_InitLibrary()) != RPX_LOADER_RESULT_SUCCESS) {
         DEBUG_FUNCTION_LINE_ERR("Homebrew on Menu Plugin: Failed to init RPXLoader. Error %d", error3);
         OSFatal("Homebrew on Menu Plugin: Failed to init RPXLoader.");
     }
@@ -394,15 +394,17 @@ DECL_FUNCTION(int32_t, ACPCheckTitleLaunchByTitleListTypeEx, MCPTitleListType *t
 
             gHomebrewLaunched = TRUE;
 
-            RPXLoader_LoadFromSDOnNextLaunch(fileInfo.value()->relativeFilepath.c_str());
-            return 0;
+            if (RPXLoader_PrepareLaunchFromSD(fileInfo.value()->relativeFilepath.c_str()) == RPX_LOADER_RESULT_SUCCESS) {
+                return 0;
+            }
+
+            DEBUG_FUNCTION_LINE_ERR("Failed to prepare launch for %s", fileInfo.value()->relativeFilepath.c_str());
         } else {
             DEBUG_FUNCTION_LINE_ERR("Failed to get info for titleID %016llX", title->titleId);
         }
     }
 
-    int result = real_ACPCheckTitleLaunchByTitleListTypeEx(title, u2);
-    return result;
+    return real_ACPCheckTitleLaunchByTitleListTypeEx(title, u2);
 }