WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-22 22:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Fail init if SDL window creation fails

Browse Source
This commit is contained in:
elasota
2024-08-07 01:44:02 -04:00
parent 547a2e6524
commit a3e8b51b37
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AerofoilSDL/GpDisplayDriver_SDL_GL2.cpp
View File

@@ -1301,6 +1301,13 @@ bool GpDisplayDriver_SDL_GL2::Init()
windowFlags |= SDL_WINDOW_RESIZABLE; windowFlags |= SDL_WINDOW_RESIZABLE;
m_window = SDL_CreateWindow(GP_APPLICATION_NAME, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, m_windowWidthPhysical, m_windowHeightPhysical, windowFlags); m_window = SDL_CreateWindow(GP_APPLICATION_NAME, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, m_windowWidthPhysical, m_windowHeightPhysical, windowFlags);
if (!m_window)
{
if (logger)
logger->Printf(IGpLogDriver::Category_Error, "Failed to create window: %s", SDL_GetError());
return false;
}
if (m_isFullScreen) if (m_isFullScreen)
{ {

13
GpShell/GpMain.cpp
View File

@@ -16,6 +16,7 @@
#include "IGpDisplayDriver.h" #include "IGpDisplayDriver.h"
#include "IGpFontHandler.h" #include "IGpFontHandler.h"
#include "IGpInputDriver.h" #include "IGpInputDriver.h"
#include "IGpLogDriver.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@@ -119,9 +120,17 @@ int GpMain::Run()
appEnvironment->SetSystemServices(g_gpGlobalConfig.m_systemServices); appEnvironment->SetSystemServices(g_gpGlobalConfig.m_systemServices);
// Start the display loop // Start the display loop
displayDriver->Init(); if (displayDriver->Init())
{
appEnvironment->Run(); appEnvironment->Run();
}
else
{
IGpLogDriver *logger = g_gpGlobalConfig.m_logger;
if (logger)
logger->Printf(IGpLogDriver::Category_Error, "Failed to start display driver");
return -1;
}
// Clean up // Clean up
if (inputDrivers) if (inputDrivers)