Commit afa25c4b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20150611-1' into staging 



sdl2: fix crash in handle_windowevent() when restoring the screen size

# gpg: Signature made Thu Jun 11 08:57:38 2015 BST using RSA key ID D3E87138
# 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>"

* remotes/kraxel/tags/pull-sdl-20150611-1:
  sdl2: fix crash in handle_windowevent() when restoring the screen size

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0b70743d 08d49df0

ui/sdl2.c

+4 −0
Original line number Diff line number Diff line
@@ -521,6 +521,10 @@ static void handle_windowevent(SDL_Event *ev) 
{

    struct sdl2_console *scon = get_scon_from_window(ev->window.windowID);



    if (!scon) {

        return;

    }



    switch (ev->window.event) {

    case SDL_WINDOWEVENT_RESIZED:

        {