mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: On close trying to remove observer from an empty collection leads to an access violation (#15739)

Browse source
This commit is contained in:
Simone Cattaneo 2018-11-19 17:47:04 +01:00 committed by John Kleinschmidt
parent e12c0dcf66
commit b97d7e7ecd
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_web_contents.h
View file

@ -298,6 +298,8 @@ class WebContents : public mate::TrackableObject<WebContents>,
observers_.AddObserver(obs); observers_.AddObserver(obs);
} }
void RemoveObserver(ExtendedWebContentsObserver* obs) { void RemoveObserver(ExtendedWebContentsObserver* obs) {
// Trying to remove from an empty collection leads to an access violation
if (observers_.might_have_observers())
observers_.RemoveObserver(obs); observers_.RemoveObserver(obs);
} }