Skip to content

Commit dc93bbf

Browse files
committed
fix: remove hook to change video player timeout waitobject
1 parent d6ee15b commit dc93bbf

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

MarathonRecomp/app.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -142,19 +142,19 @@ PPC_FUNC(sub_82744840)
142142
// __imp__sub_82558CD0(ctx, base);
143143
// }
144144

145-
PPC_FUNC_IMPL(__imp__sub_82538B48);
146-
PPC_FUNC(sub_82538B48)
147-
{
148-
// LOGN_WARNING("NtWaitForSingleObjectEx timeout converter");
149-
// printf("timeout in ms %d\n", ctx.r4.u32);
150-
if (ctx.r4.u32 == 0x1) {
151-
// __builtin_trap();
152-
std::this_thread::sleep_for(std::chrono::milliseconds(1));
153-
ctx.r4.u32 = -1;
154-
}
155-
156-
__imp__sub_82538B48(ctx, base);
157-
}
145+
// PPC_FUNC_IMPL(__imp__sub_82538B48);
146+
// PPC_FUNC(sub_82538B48)
147+
// {
148+
// // LOGN_WARNING("NtWaitForSingleObjectEx timeout converter");
149+
// // printf("timeout in ms %d\n", ctx.r4.u32);
150+
// if (ctx.r4.u32 == 0x1) {
151+
// // __builtin_trap();
152+
// std::this_thread::sleep_for(std::chrono::milliseconds(1));
153+
// ctx.r4.u32 = -1;
154+
// }
155+
156+
// __imp__sub_82538B48(ctx, base);
157+
// }
158158

159159
struct DXSettings {
160160
be<uint32_t> m_Width;

MarathonRecomp/cpu/guest_thread.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ uint32_t GuestThreadHandle::GetThreadId() const
129129

130130
uint32_t GuestThreadHandle::Wait(uint32_t timeout)
131131
{
132-
if (timeout == INFINITE || isFinished) // HACK(1): isFinished
132+
if (timeout == INFINITE || isFinished.load()) // HACK(1): isFinished
133133
{
134134
#ifdef USE_PTHREAD
135135
pthread_join(thread, nullptr);

0 commit comments

Comments
 (0)