Skip to content
Snippets Groups Projects
Commit 320a87d7 authored by Sebastian Hahta's avatar Sebastian Hahta
Browse files

fix deadlock

parent bae710b4
No related branches found
No related tags found
1 merge request!316Resolves #343 GUI and Frame Refactor
...@@ -281,16 +281,14 @@ void Frame::store() { ...@@ -281,16 +281,14 @@ void Frame::store() {
//data_.erase(c.first); //data_.erase(c.first);
d.status = ChannelStatus::INVALID; d.status = ChannelStatus::INVALID;
} }
uint64_t sig = (uint64_t(id()) << 32) + static_cast<unsigned int>(c.first);
const auto &i = parent_->change_channel_.find(sig);
if (i != parent_->change_channel_.end()) i->second.trigger(*this, c.first);
} }
} }
for (auto c : changed_) { for (auto c : changed_) {
parent_->change_.trigger(*this, c.first); 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);
if (i != parent_->change_channel_.end()) i->second.trigger(*this, c.first);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment