diff options
| author | Michal Srb <michalsrb@gmail.com> | 2015-04-01 17:35:44 +0300 |
|---|---|---|
| committer | Michal Srb <michalsrb@gmail.com> | 2015-04-01 17:35:44 +0300 |
| commit | b02996ac125f754bf5e0f32d4ca0d5747e4fb986 (patch) | |
| tree | 52de1e9b5a73fd10fda4189a37a8748a5b517426 /unix/xserver/hw/vnc/xvnc.c | |
| parent | 76cf5b34f893755594cbea2d90ed638083dea2f2 (diff) | |
| download | tigervnc-b02996ac125f754bf5e0f32d4ca0d5747e4fb986.tar.gz tigervnc-b02996ac125f754bf5e0f32d4ca0d5747e4fb986.zip | |
Warn about not reseting Xvnc and terminate instead.
VNC prevents X server restarting even when -reset is explicitly given. Print
out message with explanation and terminate instead.
Diffstat (limited to 'unix/xserver/hw/vnc/xvnc.c')
| -rw-r--r-- | unix/xserver/hw/vnc/xvnc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c index 6aad434b..d4e9daeb 100644 --- a/unix/xserver/hw/vnc/xvnc.c +++ b/unix/xserver/hw/vnc/xvnc.c @@ -1566,7 +1566,12 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv) static void vfbClientStateChange(CallbackListPtr *a, void *b, void *c) { - 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 |