aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/wii/osystem_events.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'backends/platform/wii/osystem_events.cpp')
-rw-r--r--backends/platform/wii/osystem_events.cpp23
1 files changed, 13 insertions, 10 deletions
diff --git a/backends/platform/wii/osystem_events.cpp b/backends/platform/wii/osystem_events.cpp
index 4646da8c93..7597bd65db 100644
--- a/backends/platform/wii/osystem_events.cpp
+++ b/backends/platform/wii/osystem_events.cpp
@@ -117,20 +117,22 @@ void OSystem_Wii::initEvents() {
timer_thread_quit = false;
timer_stack = (u8 *) memalign(32, TIMER_THREAD_STACKSIZE);
- memset(timer_stack, 0, TIMER_THREAD_STACKSIZE);
+ if (timer_stack) {
+ memset(timer_stack, 0, TIMER_THREAD_STACKSIZE);
- LWP_InitQueue(&timer_queue);
+ LWP_InitQueue(&timer_queue);
- s32 res = LWP_CreateThread(&timer_thread, timer_thread_func, NULL,
- timer_stack, TIMER_THREAD_STACKSIZE,
- TIMER_THREAD_PRIO);
+ s32 res = LWP_CreateThread(&timer_thread, timer_thread_func, NULL,
+ timer_stack, TIMER_THREAD_STACKSIZE,
+ TIMER_THREAD_PRIO);
- if (res) {
- printf("ERROR creating timer thread: %d\n", res);
- LWP_CloseQueue(timer_queue);
- }
+ if (res) {
+ printf("ERROR creating timer thread: %d\n", res);
+ LWP_CloseQueue(timer_queue);
+ }
- timer_thread_running = res == 0;
+ timer_thread_running = res == 0;
+ }
#ifndef GAMECUBE
WPAD_Init();
@@ -151,6 +153,7 @@ void OSystem_Wii::deinitEvents() {
LWP_JoinThread(timer_thread, NULL);
LWP_CloseQueue(timer_queue);
+ free(timer_stack);
timer_thread_running = false;
}