From f0aa8913aa1f4df37b87dcedbc257febb0e101a1 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 4 Apr 2015 19:11:45 +0300
Subject: [PATCH] Properly handle setting multiple functions in rapid
 succession

---
 source/libr2c2/arducontrol.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
 		{
-- 
2.43.0