24 lines
813 B
Diff
24 lines
813 B
Diff
|
Author: Michal Srb <msrb@suse.com>
|
||
|
|
Subject: Terminate instead of ignoring reset
|
||
|
|
Patch-Mainline: To be upstreamed
|
||
|
|
References: bnc#920969
|
||
|
|
|
||
|
|
Index: tigervnc-1.3.0/unix/xserver/hw/vnc/xvnc.cc
|
||
|
|
===================================================================
|
||
|
|
--- tigervnc-1.3.0.orig/unix/xserver/hw/vnc/xvnc.cc
|
||
|
|
+++ tigervnc-1.3.0/unix/xserver/hw/vnc/xvnc.cc
|
||
|
|
@@ -1607,7 +1607,12 @@ vfbScreenInit(ScreenPtr pScreen, int arg
|
||
|
|
|
||
|
|
|
||
|
|
static void vfbClientStateChange(CallbackListPtr*, void *, void *) {
|
||
|
|
- dispatchException &= ~DE_RESET;
|
||
|
|
+ if (dispatchException & DE_RESET) {
|
||
|
|
+ ErrorF("Warning: VNC extension does not support -reset, terminating instead. Use -noreset to prevent termination.\n");
|
||
|
|
+
|
||
|
|
+ dispatchException |= DE_TERMINATE;
|
||
|
|
+ dispatchException &= ~DE_RESET;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
#if XORG >= 113
|