Merge branch 'feature/gui2' of gitlab.utu.fi:nicolas.pope/ftl into feature/gui2

components/structures/src/new_frame.cpp

@@ -268,8 +268,8 @@ void Frame::store() {
 
 	if (!parent_) return;
 
+	{
 		UNIQUE_LOCK(parent_->mutex(), lk);
-
 		for (auto c : changed_) {
 			if (ftl::data::isPersistent(c.first) && hasOwn(c.first)) {
 				auto &d = data_[c.first];
@@ -282,7 +282,6 @@ void Frame::store() {
 				d.status = ChannelStatus::INVALID;
 			}
 
-		parent_->change_.trigger(*this, c.first);
 			uint64_t sig = (uint64_t(id()) << 32) + static_cast<unsigned int>(c.first);
 			const auto &i = parent_->change_channel_.find(sig);
 
@@ -290,6 +289,11 @@ void Frame::store() {
 		}
 	}
 
+	for (auto c : changed_) {
+		parent_->change_.trigger(*this, c.first);
+	}
+}
+
 void Frame::_primaryStore() {
 	if (mode_ == FrameMode::RESPONSE) return;
 	forceStore();