From 6d888fd61be4b3a09736e62c4e43abde542cf427 Mon Sep 17 00:00:00 2001
From: Lukas W <lukaswhl@gmail.com>
Date: Wed, 4 Nov 2015 01:02:59 +0100
Subject: [PATCH] Fix deadlock in InstrumentTrack::play

Closes #2378
---
 src/tracks/InstrumentTrack.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp
index 4f74f6a42..545c82c01 100644
--- a/src/tracks/InstrumentTrack.cpp
+++ b/src/tracks/InstrumentTrack.cpp
@@ -577,7 +577,7 @@ void InstrumentTrack::removeMidiPortNode( DataFile & _dataFile )
 bool InstrumentTrack::play( const MidiTime & _start, const fpp_t _frames,
 							const f_cnt_t _offset, int _tco_num )
 {
-	if( ! tryLock() || ! m_instrument )
+	if( ! m_instrument || ! tryLock() )
 	{
 		return false;
 	}