commit | 76819d315d68529af0e040cfdfd26563b563ea1c | [log] [tgz] |
---|---|---|
author | sergeyu@chromium.org <sergeyu@chromium.org> | Wed Oct 01 23:07:12 2014 +0000 |
committer | sergeyu@chromium.org <sergeyu@chromium.org> | Wed Oct 01 23:07:12 2014 +0000 |
tree | 3c440931573ea5a0e4d8ef21efd9df3361c67667 | |
parent | 325cff01b42064313b221f2c8819ce01218f5ca4 [diff] |
Add error trap for XFixesGetCursorImage() BUG=https://code.google.com/p/webrtc/issues/detail?id=3245 R=jiayl@webrtc.org Review URL: https://webrtc-codereview.appspot.com/31519004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7362 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc b/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc index f09593d..f5c454e 100644 --- a/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc +++ b/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc
@@ -182,9 +182,13 @@ void MouseCursorMonitorX11::CaptureCursor() { assert(have_xfixes_); - XFixesCursorImage* img = XFixesGetCursorImage(display()); - if (!img) - return; + XFixesCursorImage* img; + { + XErrorTrap error_trap(display()); + img = XFixesGetCursorImage(display()); + if (!img || error_trap.GetLastErrorAndDisable() != 0) + return; + } scoped_ptr<DesktopFrame> image( new BasicDesktopFrame(DesktopSize(img->width, img->height)));