diff options
| author | Pär Björklund <per.bjorklund@gmail.com> | 2016-08-06 23:22:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-06 23:22:50 +0200 |
| commit | a7aa8597df56ab83c5702bc3802f3e699e87269c (patch) | |
| tree | 22f4ee0ee8793df833303b843bb883fbc9068d96 | |
| parent | 79e2f50c94147eca7616e7af30142f1d9a0b768c (diff) | |
| parent | 7db128449d73e2816541c530c34405aa476c6c43 (diff) | |
Merge pull request #10240 from Paxxi/pvr_crash
[PVR] Fix crash during shutdown due to wrong usage of std::remove
| -rw-r--r-- | xbmc/utils/Observer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xbmc/utils/Observer.cpp b/xbmc/utils/Observer.cpp index d930d61b50..bbbf03a426 100644 --- a/xbmc/utils/Observer.cpp +++ b/xbmc/utils/Observer.cpp @@ -52,7 +52,9 @@ void Observable::RegisterObserver(Observer *obs) void Observable::UnregisterObserver(Observer *obs) { CSingleLock lock(m_obsCritSection); - std::remove(m_observers.begin(), m_observers.end(), obs); + auto iter = std::remove(m_observers.begin(), m_observers.end(), obs); + if (iter != m_observers.end()) + m_observers.erase(iter); } void Observable::NotifyObservers(const ObservableMessage message /* = ObservableMessageNone */) |