Commit 0de537f3 authored by wind2009's avatar wind2009

Merge remote-tracking branch 'upstream/master' into develop

parents 0f54c82c 6558610c
...@@ -2164,9 +2164,6 @@ void card::reset(uint32 id, uint32 reset_type) { ...@@ -2164,9 +2164,6 @@ void card::reset(uint32 id, uint32 reset_type) {
cmit = counters.erase(cmit); cmit = counters.erase(cmit);
} }
} }
if(id & RESET_TURN_SET) {
refresh_control_status();
}
} }
for (auto i = indexer.begin(); i != indexer.end();) { for (auto i = indexer.begin(); i != indexer.end();) {
auto rm = i++; auto rm = i++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment