From 607201d5869fc9f5b343db5b9e01094763b13d2b Mon Sep 17 00:00:00 2001
From: Andrew Nelless <nlyan@users.noreply.github.com>
Date: Tue, 5 Dec 2017 15:44:10 +0000
Subject: [PATCH] #6211 Abort if the carbon loop doesn't become ready within
 timeout

---
 src/lib/platform/OSXScreen.mm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/platform/OSXScreen.mm b/src/lib/platform/OSXScreen.mm
index 54adab54..dea25877 100644
--- a/src/lib/platform/OSXScreen.mm
+++ b/src/lib/platform/OSXScreen.mm
@@ -47,6 +47,7 @@
 #include <IOKit/hidsystem/event_status_driver.h>
 #include <AppKit/NSEvent.h>
 #include <IOKit/hidsystem/IOHIDLib.h>
+#include <cstdlib>
 
 // This isn't in any Apple SDK that I know of as of yet.
 enum {
@@ -2061,8 +2062,8 @@ OSXScreen::waitForCarbonLoop() const
 	double timeout = ARCH->time() + kCarbonLoopWaitTimeout;
 	while (!m_carbonLoopReady->wait()) {
 		if (ARCH->time() > timeout) {
-			LOG((CLOG_DEBUG "carbon loop not ready, waiting again"));
-			timeout = ARCH->time() + kCarbonLoopWaitTimeout;
+			LOG((CLOG_DEBUG "carbon loop not ready, aborting"));
+			::abort();
 		}
 	}