geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haiku: Fixed using wrong constant for internal error handling. 

SDL_CreateWindow() worked because ENOMEM is negative on Haiku.
Philipp Wiesemann 2017-07-02 22:46:23 +02:00
parent 4366721b46
commit e6583300e6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video/haiku/SDL_bwindow.cc
View File

@ -66,7 +66,7 @@ static int _InitWindow(_THIS, SDL_Window *window) {
SDL_BWin *bwin = new(std::nothrow) SDL_BWin(bounds, look, flags); SDL_BWin *bwin = new(std::nothrow) SDL_BWin(bounds, look, flags);
if(bwin == NULL) if(bwin == NULL)
return ENOMEM; return -1;
window->driverdata = bwin; window->driverdata = bwin;
int32 winID = _GetBeApp()->GetID(window); int32 winID = _GetBeApp()->GetID(window);
@ -76,8 +76,9 @@ static int _InitWindow(_THIS, SDL_Window *window) {
} }
int BE_CreateWindow(_THIS, SDL_Window *window) { int BE_CreateWindow(_THIS, SDL_Window *window) {
if(_InitWindow(_this, window) == ENOMEM) if (_InitWindow(_this, window) < 0) {
return ENOMEM; return -1;
}
/* Start window loop */ /* Start window loop */
_ToBeWin(window)->Show(); _ToBeWin(window)->Show();
@ -102,8 +103,9 @@ int BE_CreateWindowFrom(_THIS, SDL_Window * window, const void *data) {
} }
/* If we are out of memory, return the error code */ /* If we are out of memory, return the error code */
if(_InitWindow(_this, window) == ENOMEM) if (_InitWindow(_this, window) < 0) {
return ENOMEM; return -1;
}
/* TODO: Add any other SDL-supported window attributes here */ /* TODO: Add any other SDL-supported window attributes here */
_ToBeWin(window)->SetTitle(otherBWin->Title()); _ToBeWin(window)->SetTitle(otherBWin->Title());