diff --git a/Dockerfile b/Dockerfile index 29e20c2..2d5fe54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM wiiuenv/devkitppc:20210920 +FROM wiiuenv/devkitppc:20211106 COPY --from=wiiuenv/librpxloader:20211002 /artifacts $DEVKITPRO COPY --from=wiiuenv/libfunctionpatcher:20210924 /artifacts $DEVKITPRO -COPY --from=wiiuenv/wiiumodulesystem:20210924 /artifacts $DEVKITPRO +COPY --from=wiiuenv/wiiumodulesystem:20211031 /artifacts $DEVKITPRO COPY --from=wiiuenv/libromfs_wiiu:20210924 /artifacts $DEVKITPRO WORKDIR project \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 11e33f3..db6e244 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,7 @@ #include #include +#include +#include #include #include #include @@ -22,7 +24,10 @@ WUMS_MODULE_EXPORT_NAME("homebrew_rpx_loader"); WUMS_USE_WUT_DEVOPTAB(); WUMS_INITIALIZE() { - WHBLogUdpInit(); + if (!WHBLogModuleInit()) { + WHBLogCafeInit(); + WHBLogUdpInit(); + } DEBUG_FUNCTION_LINE("Patch functions"); // we only patch static functions, we don't need re-patch them and every launch FunctionPatcherPatchFunction(fs_file_function_replacements, fs_file_function_replacements_size); @@ -62,7 +67,10 @@ WUMS_APPLICATION_STARTS() { gReplacementInfo.rpxReplacementInfo.willRPXBeReplaced = false; gReplacementInfo.rpxReplacementInfo.isRPXReplaced = true; } - WHBLogUdpInit(); + if (!WHBLogModuleInit()) { + WHBLogCafeInit(); + WHBLogUdpInit(); + } if (gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_PATH) { auto fsClient = (FSClient *) memalign(0x20, sizeof(FSClient)); auto fsCmd = (FSCmdBlock *) memalign(0x20, sizeof(FSCmdBlock));