From 6189288b5a7acece4b0264e4d2306f125c38e56d Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Thu, 25 Aug 2022 15:59:48 +0200
Subject: [PATCH] Use latest librpxloader for loading homebrew

---
 Dockerfile                | 8 ++++----
 src/main.cpp              | 2 +-
 src/utils/TcpReceiver.cpp | 5 +----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c668bc9..978d2bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM wiiuenv/devkitppc:20220507
+FROM wiiuenv/devkitppc:20220806
 
-COPY --from=wiiuenv/libwupsbackend:20220514 /artifacts $DEVKITPRO
-COPY --from=wiiuenv/librpxloader:20220422 /artifacts $DEVKITPRO
-COPY --from=wiiuenv/wiiupluginsystem:20220513 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/libwupsbackend:20220724 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/librpxloader:20220825 /artifacts $DEVKITPRO
+COPY --from=wiiuenv/wiiupluginsystem:20220724 /artifacts $DEVKITPRO
 
 WORKDIR project
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index cdfb3c2..8d8b7af 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,7 +16,7 @@ TcpReceiver *thread = nullptr;
 
 INITIALIZE_PLUGIN() {
     RPXLoaderStatus error;
-    if ((error = RPXLoader_Init()) != RPX_LOADER_RESULT_SUCCESS) {
+    if ((error = RPXLoader_InitLibrary()) != RPX_LOADER_RESULT_SUCCESS) {
         DEBUG_FUNCTION_LINE_ERR("WiiLoad Plugin: Failed to init RPXLoader. Error %d", error);
         OSFatal("WiiLoad Plugin: Failed to init RPXLoader.");
     }
diff --git a/src/utils/TcpReceiver.cpp b/src/utils/TcpReceiver.cpp
index 1326418..8f869a7 100644
--- a/src/utils/TcpReceiver.cpp
+++ b/src/utils/TcpReceiver.cpp
@@ -303,11 +303,8 @@ int32_t TcpReceiver::loadToMemory(int32_t clientSocket, uint32_t ipAddress) {
     }
 
     if (loadedRPX) {
-        DEBUG_FUNCTION_LINE("Starting a homebrew title!");
-        RPXLoader_LoadFromSDOnNextLaunch(file_path);
+        RPXLoader_LaunchHomebrew(file_path)
 
-        uint64_t titleID = _SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_HEALTH_AND_SAFETY);
-        _SYSLaunchTitleWithStdArgsInNoSplash(titleID, nullptr);
         return fileSize;
     }