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

Don't leak the taskbar object, reuse it instead

Browse source
This commit is contained in:
Ales Pergl 2017-11-28 12:27:01 +01:00
parent 903a5b5100
commit 8357a33d81
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/ui/win/taskbar_host.cc
View file

@ -204,10 +204,14 @@ bool TaskbarHost::HandleThumbarButtonEvent(int button_id) {
} }
bool TaskbarHost::InitializeTaskbar() { bool TaskbarHost::InitializeTaskbar() {
if (taskbar_)
return true;
if (FAILED(::CoCreateInstance(CLSID_TaskbarList, nullptr, if (FAILED(::CoCreateInstance(CLSID_TaskbarList, nullptr,
CLSCTX_INPROC_SERVER, CLSCTX_INPROC_SERVER,
IID_PPV_ARGS(&taskbar_))) || IID_PPV_ARGS(&taskbar_))) ||
FAILED(taskbar_->HrInit())) { FAILED(taskbar_->HrInit())) {
taskbar_.Reset();
return false; return false;
} else { } else {
return true; return true;