summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/XF86Config-parser/Merge.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/XF86Config-parser/Merge.c b/src/XF86Config-parser/Merge.c
index aaf66bc..7d8ab98 100644
--- a/src/XF86Config-parser/Merge.c
+++ b/src/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;