From 88c20edf4bd967e10d6f9dd51925be2fc3734388 Mon Sep 17 00:00:00 2001
From: plutooo <plutooo@users.noreply.github.com>
Date: Sun, 28 Oct 2018 16:40:16 +0100
Subject: [PATCH] wait: Check for disabled timer

---
 nx/source/kernel/wait.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nx/source/kernel/wait.c b/nx/source/kernel/wait.c
index faab0225..0279b892 100644
--- a/nx/source/kernel/wait.c
+++ b/nx/source/kernel/wait.c
@@ -35,6 +35,10 @@ Result waitN(s32* idx_out, WaitObject* objects, size_t num_objects, u64 timeout)
         case WaitObjectType_UsermodeTimer:
             timer_tick = _utimerGetNextTime(obj->timer);
 
+            // Skip timer if disabled.
+            if (timer_tick == 0)
+                break;
+
             // If the timer already signalled, we're done.
             if (timer_tick < cur_tick)
             {