diff options
| author | Keith Packard <keithp@keithp.com> | 2012-06-14 11:05:22 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-06-14 11:05:22 -0700 |
| commit | 6d86b64dbaef5a16712fd1fdc3157f716d238877 (patch) | |
| tree | 27350a2906ab3cb99e9e507f48ac5a9f4508659f /dix/main.c | |
| parent | 812786f4d4306cb16f8ed57fa4a1a32bb1d13fe3 (diff) | |
| parent | 4c68f5d395c66f28b56e488cb3cd12f36820357b (diff) | |
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'dix/main.c')
| -rw-r--r-- | dix/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dix/main.c b/dix/main.c index 83efa7d7f..e95ca1cc2 100644 --- a/dix/main.c +++ b/dix/main.c @@ -104,6 +104,7 @@ Equipment Corporation. #include "privates.h" #include "registry.h" #include "client.h" +#include "exevents.h" #ifdef PANORAMIX #include "panoramiXsrv.h" #else @@ -295,6 +296,7 @@ main(int argc, char *argv[], char *envp[]) #endif UndisplayDevices(); + DisableAllDevices(); /* Now free up whatever must be freed */ if (screenIsSaved == SCREEN_SAVER_ON) @@ -318,7 +320,9 @@ main(int argc, char *argv[], char *envp[]) for (i = 0; i < screenInfo.numScreens; i++) screenInfo.screens[i]->root = NullWindow; + CloseDownDevices(); + CloseDownEvents(); for (i = screenInfo.numScreens - 1; i >= 0; i--) { |