From 2f5ea23a8a3b5dae2ec5c4055b867ddd68dd0062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Thu, 18 May 2017 14:37:42 +0200
Subject: [PATCH] Prevent a deadlock between View::eventMutex_ and
 ScreenManager::inputMutex_ by locking here so the reverse lock order can't
 happen.

---
 ext/native/ui/screen.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/native/ui/screen.cpp b/ext/native/ui/screen.cpp
index ef8665802d..e879fef120 100644
--- a/ext/native/ui/screen.cpp
+++ b/ext/native/ui/screen.cpp
@@ -39,6 +39,7 @@ void ScreenManager::switchScreen(Screen *screen) {
 }
 
 void ScreenManager::update() {
+	std::lock_guard<std::recursive_mutex> guard(inputLock_);
 	if (nextScreen_) {
 		switchToNext();
 	}