Leahnaya/WiiUPluginLoaderBackend
1
0
Fork 0
mirror of https://github.com/wiiu-env/WiiUPluginLoaderBackend.git synced 2026-03-21 17:25:21 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Block on VPADRead() while the plugin menu is open.

Browse Source
This commit is contained in:
Daniel K. O. (dkosmari) 2025-02-12 16:50:13 -03:00
parent 9aa660a302
commit 670329db60
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/patcher/hooks_patcher_static.cpp
View File

@ -8,8 +8,10 @@
#include "plugin/SectionInfo.h"
#include "utils/config/ConfigUtils.h"
#include <coreinit/cache.h>
#include <coreinit/core.h>
#include <coreinit/messagequeue.h>
#include <coreinit/time.h>
#include <padscore/wpad.h>
#include <vpad/input.h>
@ -21,9 +23,11 @@ DECL_FUNCTION(void, GX2SwapScanBuffers, void) {
if (sWantsToOpenConfigMenu && !gConfigMenuOpened) {
gConfigMenuOpened = true;
OSMemoryBarrier();
ConfigUtils::openConfigMenu();
gConfigMenuOpened = false;
sWantsToOpenConfigMenu = false;
OSMemoryBarrier();
}
}
@ -89,6 +93,8 @@ DECL_FUNCTION(int32_t, VPADRead, int32_t chan, VPADStatus *buffer, uint32_t buff
if (gConfigMenuOpened) {
// Ignore reading vpad input only from other threads if the config menu is opened
if (OSGetCurrentThread() != gOnlyAcceptFromThread) {
while (gConfigMenuOpened)
OSSleepTicks(OSMillisecondsToTicks(10));
return 0;
}
}

2
source/utils/config/ConfigUtils.cpp
View File

@ -20,6 +20,7 @@
#include <wups/config.h>
#include <wups/hooks.h>
#include <coreinit/cache.h>
#include <coreinit/title.h>
#include <sysapp/launch.h>
@ -165,6 +166,7 @@ void ConfigUtils::displayMenu() {
bool skipFirstInput = true;
gOnlyAcceptFromThread = OSGetCurrentThread();
OSMemoryBarrier();
ConfigSubState subStateReturnValue = SUB_STATE_ERROR;
while (true) {
startTime = OSGetTime();