From 1f2b65b30873e8139ca431830b26f4aebd0afea6 Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Sat, 6 Nov 2021 23:16:37 +0100
Subject: [PATCH] Use the LoggingModule if possible

---
 Dockerfile      |  2 +-
 source/main.cpp | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9fa4d10..afe676c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM wiiuenv/devkitppc:20210920
+FROM wiiuenv/devkitppc:20211106
 
 COPY --from=wiiuenv/wiiumodulesystem:20211031 /artifacts $DEVKITPRO
 COPY --from=wiiuenv/wiiupluginsystem:20211001 /artifacts $DEVKITPRO
diff --git a/source/main.cpp b/source/main.cpp
index cd2a13c..b228f6e 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -1,4 +1,6 @@
 #include <whb/log_udp.h>
+#include <whb/log_cafe.h>
+#include <whb/log_module.h>
 #include <wums.h>
 #include <coreinit/debug.h>
 #include <coreinit/cache.h>
@@ -18,7 +20,10 @@ WUMS_MODULE_EXPORT_NAME("homebrew_wupsbackend");
 WUMS_USE_WUT_DEVOPTAB();
 
 WUMS_INITIALIZE(args) {
-    WHBLogUdpInit();
+    if (!WHBLogModuleInit()) {
+        WHBLogCafeInit();
+        WHBLogUdpInit();
+    }
 
     gModuleData = args.module_information;
     if (gModuleData == nullptr) {
@@ -51,7 +56,10 @@ WUMS_APPLICATION_ENDS() {
 void *allocOnCustomHeap(int alignment, int size);
 
 WUMS_APPLICATION_STARTS() {
-    WHBLogUdpInit();
+    if (!WHBLogModuleInit()) {
+        WHBLogCafeInit();
+        WHBLogUdpInit();
+    }
     uint32_t upid = OSGetUPID();
     if (upid != 2 && upid != 15) {
         return;