From 9195fe6efef569af90d0c62a2c68d79b4b562033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Thu, 13 Nov 2008 22:14:40 +0000 Subject: [PATCH] * Don't return B_OK from Start() if opening the device failed. Then Stop() won't be called, the control thread will remove the device anyways. * Turned off the debug output I left on accidentally in KeyboardInputDevice. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28642 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../input_server/devices/keyboard/KeyboardInputDevice.cpp | 5 +++-- src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp | 2 +- .../input_server/devices/touchpad/TouchpadInputDevice.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp index c16560bcfa..749fdc7912 100644 --- a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp +++ b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp @@ -27,7 +27,7 @@ #undef TRACE -#define TRACE_KEYBOARD_DEVICE +//#define TRACE_KEYBOARD_DEVICE #ifdef TRACE_KEYBOARD_DEVICE class FunctionTracer { @@ -497,7 +497,8 @@ KeyboardDevice::Start() fActive = true; resume_thread(fThread); - return B_OK; + + return fFD >= 0 ? B_OK : B_ERROR; } void diff --git a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp index cc2faefd57..fc04fdc3cd 100644 --- a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp +++ b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp @@ -210,7 +210,7 @@ MouseDevice::Start() return status; } - return B_OK; + return fDevice >= 0 ? B_OK : B_ERROR; } diff --git a/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.cpp b/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.cpp index b8ae6f9af3..031fdb4eba 100644 --- a/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.cpp +++ b/src/add-ons/input_server/devices/touchpad/TouchpadInputDevice.cpp @@ -180,7 +180,7 @@ TouchpadDevice::Start() return status; } - return B_OK; + return fDevice >= 0 ? B_OK : B_ERROR; }