diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2011-07-20 08:58:47 -0700 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-03-27 09:31:59 -0400 |
| commit | 568ad0cbebec871fd48c77c933503dd297389a83 (patch) | |
| tree | f3a11d4a77d638254ca64abf9f3afd768f510c1b | |
| parent | 80053d97e23bcb53356ad4ff58e199bcdfaae85f (diff) | |
xwayland: Skip config_init() when in Wayland mode
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 13cc428a5..f79f7af92 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -894,6 +894,11 @@ InitInput(int argc, char **argv) mieqInit(); + GetEventList(&xf86Events); + + if (xorgWayland) + return; + /* Initialize all configured input devices */ for (pInfo = xf86ConfigLayout.inputs; pInfo && *pInfo; pInfo++) { (*pInfo)->options = xf86AddNewOption((*pInfo)->options, "driver", (*pInfo)->driver); |