summaryrefslogtreecommitdiff
path: root/src/connection.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/connection.cpp')
-rw-r--r--src/connection.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/connection.cpp b/src/connection.cpp
index 8f83f6219..bc9279649 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -592,8 +592,9 @@ void * Connection::Thread()
runTimeouts(dtime);
+ //NOTE this is only thread safe for ONE consumer thread!
while(!m_command_queue.empty()){
- ConnectionCommand c = m_command_queue.pop_front();
+ ConnectionCommand c = m_command_queue.pop_frontNoEx();
processCommand(c);
}
@@ -1556,7 +1557,7 @@ ConnectionEvent Connection::getEvent()
e.type = CONNEVENT_NONE;
return e;
}
- return m_event_queue.pop_front();
+ return m_event_queue.pop_frontNoEx();
}
ConnectionEvent Connection::waitEvent(u32 timeout_ms)