mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a obs::safe_list() for ui::Timers to avoid data races between threads

Browse Source
This commit is contained in:
David Capello 2017-11-03 10:51:45 -03:00
parent 86c8bc57a5
commit f2a2510cea
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/observable

@ -1 +1 @@
Subproject commit 8ff3884bd4ed792cbd2d73fe78e993f893687ef4
Subproject commit f9a56dc12f651202273329aa20668ae0b3416d2e

13
src/ui/timer.cpp
View File

@ -11,16 +11,14 @@
#include "ui/timer.h"
#include "base/time.h"
#include "obs/safe_list.h"
#include "ui/manager.h"
#include "ui/message.h"
#include "ui/widget.h"
#include <algorithm>
#include <list>
namespace ui {
typedef std::list<Timer*> Timers;
typedef obs::safe_list<Timer> Timers;
static Timers timers; // Registered timers
@ -37,9 +35,7 @@ Timer::Timer(int interval, Widget* owner)
Timer::~Timer()
{
Timers::iterator it = std::find(timers.begin(), timers.end(), this);
ASSERT(it != timers.end());
timers.erase(it);
timers.erase(this);
// Stop the timer and remove it from the message queue.
stop();
@ -84,8 +80,7 @@ void Timer::pollTimers()
if (!timers.empty()) {
base::tick_t t = base::current_tick();
for (Timers::iterator it=timers.begin(), end=timers.end(); it != end; ++it) {
Timer* timer = *it;
for (auto timer : timers) {
if (timer && timer->isRunning()) {
int64_t count = ((t - timer->m_lastTick) / timer->m_interval);
if (count > 0) {