projects / packages / XFree86.git / blame
| Commit | Line | Data |
|---|---|---|
| 4c4ce7f9 MM |
1 | =================================================================== |
| 2 | RCS file: /xf86/anoncvs/cvs/xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v | |
| 3 | retrieving revision 3.272 | |
| 4 | retrieving revision 3.273 | |
| 5 | diff -u -p -r3.272 -r3.273 | |
| 6 | --- xc/programs/Xserver/hw/xfree86/common/xf86Config.c 2003/08/24 20:52:30 3.272 | |
| 7 | +++ xc/programs/Xserver/hw/xfree86/common/xf86Config.c 2003/08/27 02:50:25 3.273 | |
| 4c4ce7f9 MM |
8 | @@ -1451,7 +1451,7 @@ checkCoreInputDevices(serverLayoutPtr se |
| 9 | indp[count - 1].extraOptions = xf86addNewOption(NULL, "CorePointer", NULL); | |
| 10 | indp[count].identifier = NULL; | |
| 11 | servlayoutp->inputs = indp; | |
| 12 | - } else { | |
| 13 | + } else if (!havePointer) { | |
| 14 | /* This should never happen. */ | |
| 15 | xf86Msg(X_ERROR, "Cannot locate a core pointer device.\n"); | |
| 16 | return FALSE; | |
| 17 | @@ -1473,7 +1473,7 @@ checkCoreInputDevices(serverLayoutPtr se | |
| 18 | indp[count - 1].extraOptions = xf86addNewOption(NULL, "CoreKeyboard", NULL); | |
| 19 | indp[count].identifier = NULL; | |
| 20 | servlayoutp->inputs = indp; | |
| 21 | - } else { | |
| 22 | + } else if (!haveKeyboard) { | |
| 23 | /* This should never happen. */ | |
| 24 | xf86Msg(X_ERROR, "Cannot locate a core keyboard device\n"); | |
| 25 | return FALSE; |