--- hatari/src/gui-sdl/dlgAlert.c 2019/04/09 08:54:41 1.1.1.10 +++ hatari/src/gui-sdl/dlgAlert.c 2019/04/09 08:57:07 1.1.1.12 @@ -48,8 +48,8 @@ static SGOBJ alertdlg[] = { SGTEXT, 0, 0, 1,3, 50,1, dlglines[2] }, { SGTEXT, 0, 0, 1,4, 50,1, dlglines[3] }, { SGBUTTON, SG_DEFAULT, 0, 5,5, 8,1, "OK" }, - { SGBUTTON, SG_CANCEL, 0, 24,5, 8,1, "Cancel" }, - { -1, 0, 0, 0,0, 0,0, NULL } + { SGBUTTON, SG_CANCEL, 0, 24,5, 8,1, NULL }, + { SGSTOP, 0, 0, 0,0, 0,0, NULL } }; @@ -130,7 +130,12 @@ static int DlgAlert_ShowDlg(const char * int lines, i, len, offset; bool bOldMouseVisibility; int nOldMouseX, nOldMouseY; + bool bWasEmuActive; +#if WITH_SDL2 + bool bOldMouseMode = SDL_GetRelativeMouseMode(); + SDL_SetRelativeMouseMode(SDL_FALSE); +#endif strcpy(t, text); lines = DlgAlert_FormatTextToBox(t, maxlen, &len); offset = (maxlen-len)/2; @@ -156,15 +161,24 @@ static int DlgAlert_ShowDlg(const char * return false; SDLGui_CenterDlg(alertdlg); + bWasEmuActive = Main_PauseEmulation(true); + SDL_GetMouseState(&nOldMouseX, &nOldMouseY); bOldMouseVisibility = SDL_ShowCursor(SDL_QUERY); SDL_ShowCursor(SDL_ENABLE); - i = SDLGui_DoDialog(alertdlg, NULL); + i = SDLGui_DoDialog(alertdlg, NULL, false); SDL_UpdateRect(sdlscrn, 0,0, 0,0); SDL_ShowCursor(bOldMouseVisibility); - Main_WarpMouse(nOldMouseX, nOldMouseY); + Main_WarpMouse(nOldMouseX, nOldMouseY, true); + +#if WITH_SDL2 + SDL_SetRelativeMouseMode(bOldMouseMode); +#endif + + if (bWasEmuActive) + Main_UnPauseEmulation(); return (i == DLGALERT_OK); }