From 23b196952b0ecc3d755230873d386e4915914a20 Mon Sep 17 00:00:00 2001
From: Johannes Mueller <github@johannes-mueller.org>
Date: Fri, 19 Apr 2019 20:32:19 +0200
Subject: [PATCH] Fix restoring of CC121 configuration

The button ids are in the children of the cc121 protocol node, not in the
protocol node itself.
---
 libs/surfaces/cc121/cc121.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/surfaces/cc121/cc121.cc b/libs/surfaces/cc121/cc121.cc
index dce1a63b54..0051901f1d 100644
--- a/libs/surfaces/cc121/cc121.cc
+++ b/libs/surfaces/cc121/cc121.cc
@@ -782,7 +782,7 @@ CC121::set_state (const XMLNode& node, int version)
 	for (XMLNodeList::const_iterator n = node.children().begin(); n != node.children().end(); ++n) {
 		if ((*n)->name() == X_("Button")) {
 			int32_t xid;
-			if (!node.get_property ("id", xid)) {
+			if (!(*n)->get_property ("id", xid)) {
 				continue;
 			}
 			ButtonMap::iterator b = buttons.find (ButtonID (xid));