Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1610)

Unified Diff: remoting/host/event_executor_linux.cc

Issue 10986023: Fix nx crash. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: ERROR->INFO Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/event_executor_linux.cc
diff --git a/remoting/host/event_executor_linux.cc b/remoting/host/event_executor_linux.cc
index 140a2483fe948cdf00fa9d730d189a7c2a539560..3ac339211af2877cd048f81ef9b19aacba223e20 100644
--- a/remoting/host/event_executor_linux.cc
+++ b/remoting/host/event_executor_linux.cc
@@ -302,12 +302,16 @@ void EventExecutorLinux::InitMouseButtonMap() {
}
XFreeDeviceList(devices);
- if (!device_found)
- LOG(ERROR) << "Cannot find XTest device.";
+ if (!device_found) {
+ LOG(INFO) << "Cannot find XTest device.";
+ return;
+ }
XDevice* device = XOpenDevice(display_, device_id);
- if (!device)
+ if (!device) {
LOG(ERROR) << "Cannot open XTest device.";
+ return;
+ }
int num_device_buttons = XGetDeviceButtonMapping(display_, device, NULL, 0);
scoped_array<unsigned char> button_mapping(new unsigned char[num_buttons]);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698