svn merge ^/branches/released .

1 files changed, 6 insertions, 0 deletions

diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index 734d4171c..1fc62968c 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -225,6 +225,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)
         {

             classes = to->unused_classes;

             to->intfeed = classes->intfeed;

+            classes->intfeed = NULL;

         }

 

         i = &to->intfeed;

@@ -260,6 +261,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)
         {

             classes = to->unused_classes;

             to->stringfeed = classes->stringfeed;

+            classes->stringfeed = NULL;

         }

 

         s = &to->stringfeed;

@@ -295,6 +297,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)
         {

             classes = to->unused_classes;

             to->bell = classes->bell;

+            classes->bell = NULL;

         }

 

         b = &to->bell;

@@ -331,6 +334,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)
         {

             classes = to->unused_classes;

             to->leds = classes->leds;

+            classes->leds = NULL;

         }

 

         l = &to->leds;

@@ -381,6 +385,7 @@ DeepCopyKeyboardClasses(DeviceIntPtr from, DeviceIntPtr to)
             to->kbdfeed = classes->kbdfeed;

             if (!to->kbdfeed)

                 InitKeyboardDeviceStruct(to, NULL, NULL, NULL);

+            classes->kbdfeed = NULL;

         }

 

         k = &to->kbdfeed;

@@ -508,6 +513,7 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
         {

             classes = to->unused_classes;

             to->ptrfeed = classes->ptrfeed;

+            classes->ptrfeed = NULL;

         }

 

         p = &to->ptrfeed;