diff --git a/src/Backends/GLFW3/Misc.cpp b/src/Backends/GLFW3/Misc.cpp index f6f032bb..66ee37c5 100644 --- a/src/Backends/GLFW3/Misc.cpp +++ b/src/Backends/GLFW3/Misc.cpp @@ -14,11 +14,11 @@ #include "Window.h" #include "../Rendering.h" +#include "../../Attributes.h" #include "../../Main.h" #include "../../Organya.h" #include "../../Profile.h" #include "../../Resource.h" -#include "../../Attributes.h" #define DO_KEY(GLFW_KEY, BACKEND_KEY) \ case GLFW_KEY: \ diff --git a/src/Backends/Misc.h b/src/Backends/Misc.h index 00ba3e1f..502c81fb 100644 --- a/src/Backends/Misc.h +++ b/src/Backends/Misc.h @@ -1,7 +1,7 @@ #pragma once -#include "../WindowsWrapper.h" #include "../Attributes.h" +#include "../WindowsWrapper.h" enum { diff --git a/src/Backends/Rendering/SDLSurface.cpp b/src/Backends/Rendering/SDLSurface.cpp index 7635e1dd..2b0da628 100644 --- a/src/Backends/Rendering/SDLSurface.cpp +++ b/src/Backends/Rendering/SDLSurface.cpp @@ -52,12 +52,11 @@ RenderBackend_Surface* RenderBackend_Init(const char *window_title, int screen_w if (window != NULL) { if (fullscreen) - { if (SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN) < 0) Backend_PrintError("Could not set window to fullscreen: %s", SDL_GetError()); - } window_sdlsurface = SDL_GetWindowSurface(window); + if (window_sdlsurface != NULL) { framebuffer.sdlsurface = SDL_CreateRGBSurfaceWithFormat(0, window_sdlsurface->w, window_sdlsurface->h, 0, SDL_PIXELFORMAT_RGB24);