173.14.12173.14.12

1 files changed, 5 insertions, 0 deletions

diff --git a/XF86Config-parser/Merge.c b/XF86Config-parser/Merge.c
index aaf66bc..7d8ab98 100644
--- a/XF86Config-parser/Merge.c
+++ b/XF86Config-parser/Merge.c
@@ -479,6 +479,7 @@ static int xconfigMergeDisplays(XConfigScreenPtr dstScreen,
     /* Free all the displays in the destination screen */
 
     xconfigFreeDisplayList(dstScreen->displays);
+    dstScreen->displays = NULL;
 
     /* Copy all te displays */
     
@@ -530,6 +531,10 @@ static int xconfigMergeDisplays(XConfigScreenPtr dstScreen,
 
             srcMode = srcMode->next;
         }
+
+        dstScreen->displays =
+            (XConfigDisplayPtr)xconfigAddListItem((GenericListPtr)(dstScreen->displays),
+                                                  (GenericListPtr)dstDisplay);
     }
 
     return 1;