history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-05-04 19:25:42 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

NoGUI: Fix crash when initialization fails

Browse Source
This commit is contained in:
Connor McLaughlin 2021-02-05 02:34:08 +10:00
parent 39a4aafee5
commit 05545566e7
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/duckstation-nogui/nogui_host_interface.cpp
View File

@ -16,11 +16,11 @@
#include "frontend-common/ini_settings_interface.h" #include "frontend-common/ini_settings_interface.h"
#include "frontend-common/opengl_host_display.h" #include "frontend-common/opengl_host_display.h"
#include "frontend-common/vulkan_host_display.h" #include "frontend-common/vulkan_host_display.h"
#include <cinttypes>
#include <cmath>
#include "imgui.h" #include "imgui.h"
#include "imgui_internal.h" #include "imgui_internal.h"
#include "imgui_stdlib.h" #include "imgui_stdlib.h"
#include <cinttypes>
#include <cmath>
Log_SetChannel(NoGUIHostInterface); Log_SetChannel(NoGUIHostInterface);
#ifdef WIN32 #ifdef WIN32
@ -73,8 +73,6 @@ bool NoGUIHostInterface::Initialize()
void NoGUIHostInterface::Shutdown() void NoGUIHostInterface::Shutdown()
{ {
DestroySystem();
CommonHostInterface::Shutdown(); CommonHostInterface::Shutdown();
if (m_display) if (m_display)
@ -205,9 +203,9 @@ bool NoGUIHostInterface::CreateDisplay()
!m_display->InitializeRenderDevice(GetShaderCacheBasePath(), g_settings.gpu_use_debug_device, !m_display->InitializeRenderDevice(GetShaderCacheBasePath(), g_settings.gpu_use_debug_device,
g_settings.gpu_threaded_presentation)) g_settings.gpu_threaded_presentation))
{ {
ReportError("Failed to create/initialize display render device");
m_display->DestroyRenderDevice(); m_display->DestroyRenderDevice();
m_display.reset(); m_display.reset();
ReportError("Failed to create/initialize display render device");
return false; return false;
} }
@ -215,13 +213,13 @@ bool NoGUIHostInterface::CreateDisplay()
(m_fullscreen_ui_enabled && !FullscreenUI::Initialize(this, m_settings_interface.get())) || (m_fullscreen_ui_enabled && !FullscreenUI::Initialize(this, m_settings_interface.get())) ||
!m_display->UpdateImGuiFontTexture()) !m_display->UpdateImGuiFontTexture())
{ {
ReportError("Failed to initialize imgui/fonts/fullscreen UI");
if (m_fullscreen_ui_enabled) if (m_fullscreen_ui_enabled)
FullscreenUI::Shutdown(); FullscreenUI::Shutdown();
m_display->DestroyImGuiContext(); m_display->DestroyImGuiContext();
m_display->DestroyRenderDevice(); m_display->DestroyRenderDevice();
m_display.reset(); m_display.reset();
ReportError("Failed to initialize imgui/fonts/fullscreen UI");
return false; return false;
} }