wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 899011 - Make WinTaskbar.GetAvailable() return false if initializing the taskbar fails r=jimm

Browse Source
This commit is contained in:
Tim Taubert 2014-01-11 23:02:00 +01:00
parent addbc75a3d
commit e37c322253
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
widget/windows/WinTaskbar.cpp
View File

@ -220,6 +220,7 @@ WinTaskbar::Initialize() {
hr = mTaskbar->HrInit();
if (FAILED(hr)) {
// This may fail with shell extensions like blackbox installed.
NS_WARNING("Unable to initialize taskbar");
NS_RELEASE(mTaskbar);
return false;
@ -366,7 +367,9 @@ WinTaskbar::RegisterAppUserModelID() {
NS_IMETHODIMP
WinTaskbar::GetAvailable(bool *aAvailable) {
*aAvailable = IsWin7OrLater();
// ITaskbarList4::HrInit() may fail with shell extensions like blackbox
// installed. Initialize early to return available=false in those cases.
*aAvailable = IsWin7OrLater() && Initialize();
return NS_OK;
}