mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-28 05:50:37 +00:00
monitor: Don't change VNC server when disabled (Jan Kiszka)
[ As requested, broken out of the monitor rework series. ] Avoid a segfault when the user issues 'change vnc' without having vnc enabled on startup. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6616 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
322691a5c9
commit
452b4d88e5
4
vnc.c
4
vnc.c
@ -2333,6 +2333,8 @@ void vnc_display_close(DisplayState *ds)
|
||||
{
|
||||
VncState *vs = ds ? (VncState *)ds->opaque : vnc_state;
|
||||
|
||||
if (!vs)
|
||||
return;
|
||||
if (vs->display) {
|
||||
qemu_free(vs->display);
|
||||
vs->display = NULL;
|
||||
@ -2392,6 +2394,8 @@ int vnc_display_open(DisplayState *ds, const char *display)
|
||||
int tls = 0, x509 = 0;
|
||||
#endif
|
||||
|
||||
if (!vnc_state)
|
||||
return -1;
|
||||
vnc_display_close(ds);
|
||||
if (strcmp(display, "none") == 0)
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user