I had said:
commit c42311a9d7d2e5a67bdb7f4fa32032b4feba59b1
Author: Adam Jackson <[email protected]>
Date: Fri Mar 24 15:58:54 2017 -0400
kdrive: Remove KdOsFuncs
Only the Init slot was used, and Xephyr can just as easily do
that initialization directly.
And I'd've been right, but I forgot to make that initialization only
happen on startup (i.e. when serverGeneration == 1).
Reported-by: Michel Dänzer <[email protected]>
Signed-off-by: Adam Jackson <[email protected]>
---
hw/kdrive/ephyr/ephyrinit.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index 8a4e3a350..947a6e8ef 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -374,10 +374,12 @@ OsVendorInit(void)
if (hostx_want_host_cursor())
ephyrFuncs.initCursor = &ephyrCursorInit;
- if (!KdCardInfoLast()) {
- processScreenArg("640x480", NULL);
+ if (serverGeneration == 1) {
+ if (!KdCardInfoLast()) {
+ processScreenArg("640x480", NULL);
+ }
+ hostx_init();
}
- hostx_init();
}
KdCardFuncs ephyrFuncs = {
--
2.12.2
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
