summary refs log tree commit diff stats
path: root/ui/sdl2.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-10-01 15:44:30 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-10-01 15:44:30 +0100
commita2ef4d9e95400cd387ab4ae19a317741e458fb07 (patch)
tree9f459ad57b06799ad83de5885fdbdb60dc76b295 /ui/sdl2.c
parent24c3833717d2528b98833bb5ebf4397a5512043f (diff)
parente8b1386ea1719525a1a92df03377764703fe8c64 (diff)
downloadfocaccia-qemu-a2ef4d9e95400cd387ab4ae19a317741e458fb07.tar.gz
focaccia-qemu-a2ef4d9e95400cd387ab4ae19a317741e458fb07.zip
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20181001-pull-request' into staging
ui: some small fixes/improvements.

# gpg: Signature made Mon 01 Oct 2018 11:42:16 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20181001-pull-request:
  gtk: add zoom-to-fit to gtk options.
  vnc: call sasl_server_init() only when required
  sdl2: show console #0 unconditionally

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/sdl2.c')
-rw-r--r--ui/sdl2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 0a9a18a964..2696b95c79 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -806,7 +806,8 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
     for (i = 0; i < sdl2_num_outputs; i++) {
         QemuConsole *con = qemu_console_lookup_by_index(i);
         assert(con != NULL);
-        if (!qemu_console_is_graphic(con)) {
+        if (!qemu_console_is_graphic(con) &&
+            qemu_console_get_index(con) != 0) {
             sdl2_console[i].hidden = true;
         }
         sdl2_console[i].idx = i;