From 761be8ab7fb62965b8dc9dfd6ac6451cda578ad0 Mon Sep 17 00:00:00 2001
From: Kevin Ballard <kevin@sb.org>
Date: Fri, 19 Sep 2014 17:00:29 -0700
Subject: [PATCH] Fix intermittent crash in iothread.cpp

The wrong lock was being taken around the result queue, leading to the
occasional crash when processing interactive input. This didn't seem to
really affect normal day-to-day usage, but it did sometimes cause the
interactive tests to crash.

Fixes #1692.
---
 iothread.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iothread.cpp b/iothread.cpp
index eb6b3ccd9..1fcd137f1 100644
--- a/iothread.cpp
+++ b/iothread.cpp
@@ -332,7 +332,7 @@ static void iothread_service_result_queue()
     // Move the queue to a local variable
     std::queue<SpawnRequest_t *> result_queue;
     {
-        scoped_lock queue_lock(s_main_thread_request_queue_lock);
+        scoped_lock queue_lock(s_result_queue_lock);
         std::swap(result_queue, s_result_queue);
     }