Index: chrome/common/win_util.cc |
=================================================================== |
--- chrome/common/win_util.cc (revision 13759) |
+++ chrome/common/win_util.cc (working copy) |
@@ -530,7 +530,7 @@ |
taskbar_data.uEdge = edge; |
HWND taskbar = reinterpret_cast<HWND>(SHAppBarMessage(ABM_GETAUTOHIDEBAR, |
&taskbar_data)); |
- return ::IsWindow(taskbar) && |
+ return ::IsWindow(taskbar) && (monitor != NULL) && |
(MonitorFromWindow(taskbar, MONITOR_DEFAULTTONULL) == monitor) && |
(GetWindowLong(taskbar, GWL_EXSTYLE) & WS_EX_TOPMOST); |
} |