From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 4 Apr 2015 16:11:45 +0000 (+0300)
Subject: Properly handle setting multiple functions in rapid succession
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=f0aa8913aa1f4df37b87dcedbc257febb0e101a1;p=r2c2.git

Properly handle setting multiple functions in rapid succession
---

diff --git a/source/libr2c2/arducontrol.cpp b/source/libr2c2/arducontrol.cpp
index 7b5fc10..8aced3b 100644
--- a/source/libr2c2/arducontrol.cpp
+++ b/source/libr2c2/arducontrol.cpp
@@ -208,7 +208,7 @@ void ArduControl::set_loco_function(unsigned id, unsigned func, bool state)
 		throw invalid_argument("ArduControl::set_loco_function");
 
 	unsigned mask = 1<<func;
-	if(loco.funcs.set((loco.funcs&~mask)|(mask*state)))
+	if(loco.funcs.set((loco.funcs.pending&~mask)|(mask*state)))
 	{
 		if(func>0 || loco.proto!=MM)
 		{