ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-03-26 19:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when creating a dummy window on Mac OS X

Browse source
This commit is contained in:
Sam Lantinga 2016-12-11 11:45:33 -08:00
parent d6bcec8f6a
commit cb5a0b0f6a
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/video/SDL_video.c
View file

@ -1164,8 +1164,9 @@ SDL_UpdateFullscreenMode(SDL_Window * window, SDL_bool fullscreen)
CHECK_WINDOW_MAGIC(window,-1); CHECK_WINDOW_MAGIC(window,-1);
/* if we are in the process of hiding don't go back to fullscreen */ /* if we are in the process of hiding don't go back to fullscreen */
if ( window->is_hiding && fullscreen ) if (window->is_hiding && fullscreen) {
return 0; return 0;
}
#ifdef __MACOSX__ #ifdef __MACOSX__
/* if the window is going away and no resolution change is necessary, /* if the window is going away and no resolution change is necessary,
@ -1174,6 +1175,7 @@ SDL_UpdateFullscreenMode(SDL_Window * window, SDL_bool fullscreen)
if (window->is_destroying && (window->last_fullscreen_flags & FULLSCREEN_MASK) == SDL_WINDOW_FULLSCREEN_DESKTOP) if (window->is_destroying && (window->last_fullscreen_flags & FULLSCREEN_MASK) == SDL_WINDOW_FULLSCREEN_DESKTOP)
return 0; return 0;
if (SDL_strcmp(_this->name, "dummy") != 0) {
/* If we're switching between a fullscreen Space and "normal" fullscreen, we need to get back to normal first. */ /* If we're switching between a fullscreen Space and "normal" fullscreen, we need to get back to normal first. */
if (fullscreen && ((window->last_fullscreen_flags & FULLSCREEN_MASK) == SDL_WINDOW_FULLSCREEN_DESKTOP) && ((window->flags & FULLSCREEN_MASK) == SDL_WINDOW_FULLSCREEN)) { if (fullscreen && ((window->last_fullscreen_flags & FULLSCREEN_MASK) == SDL_WINDOW_FULLSCREEN_DESKTOP) && ((window->flags & FULLSCREEN_MASK) == SDL_WINDOW_FULLSCREEN)) {
if (!Cocoa_SetWindowFullscreenSpace(window, SDL_FALSE)) { if (!Cocoa_SetWindowFullscreenSpace(window, SDL_FALSE)) {
@ -1194,6 +1196,7 @@ SDL_UpdateFullscreenMode(SDL_Window * window, SDL_bool fullscreen)
window->last_fullscreen_flags = window->flags; window->last_fullscreen_flags = window->flags;
return 0; return 0;
} }
}
#elif __WINRT__ && (NTDDI_VERSION < NTDDI_WIN10) #elif __WINRT__ && (NTDDI_VERSION < NTDDI_WIN10)
/* HACK: WinRT 8.x apps can't choose whether or not they are fullscreen /* HACK: WinRT 8.x apps can't choose whether or not they are fullscreen
or not. The user can choose this, via OS-provided UI, but this can't or not. The user can choose this, via OS-provided UI, but this can't
@ -1345,7 +1348,7 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
} }
} }
if ( (((flags & SDL_WINDOW_UTILITY) != 0) + ((flags & SDL_WINDOW_TOOLTIP) != 0) + ((flags & SDL_WINDOW_POPUP_MENU) != 0)) > 1 ) { if ((((flags & SDL_WINDOW_UTILITY) != 0) + ((flags & SDL_WINDOW_TOOLTIP) != 0) + ((flags & SDL_WINDOW_POPUP_MENU) != 0)) > 1) {
SDL_SetError("Conflicting window flags specified"); SDL_SetError("Conflicting window flags specified");
return NULL; return NULL;
} }
@ -3790,7 +3793,7 @@ SDL_SetWindowHitTest(SDL_Window * window, SDL_HitTest callback, void *userdata)
float SDL_ComputeDiagonalDPI(int hpix, int vpix, float hinches, float vinches) float SDL_ComputeDiagonalDPI(int hpix, int vpix, float hinches, float vinches)
{ {
float den2 = hinches * hinches + vinches * vinches; float den2 = hinches * hinches + vinches * vinches;
if ( den2 <= 0.0f ) { if (den2 <= 0.0f) {
return 0.0f; return 0.0f;
} }