From 9fc309d5b5468cb80d6aea502939f48c7bcf611b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 19 May 2017 12:20:33 +0200 Subject: [PATCH] - stop the music when processing a fatal error. --- src/posix/cocoa/i_main.mm | 2 ++ src/win32/i_main.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/posix/cocoa/i_main.mm b/src/posix/cocoa/i_main.mm index d8fef4932..1c418b91b 100644 --- a/src/posix/cocoa/i_main.mm +++ b/src/posix/cocoa/i_main.mm @@ -32,6 +32,7 @@ */ #include "i_common.h" +#include "s_sound.h" #include #include @@ -125,6 +126,7 @@ void popterm() void Mac_I_FatalError(const char* const message) { I_SetMainWindowVisible(false); + S_StopMusic(true); FConsoleWindow::GetInstance().ShowFatalError(message); } diff --git a/src/win32/i_main.cpp b/src/win32/i_main.cpp index c82fb1969..4ae1595ef 100644 --- a/src/win32/i_main.cpp +++ b/src/win32/i_main.cpp @@ -81,6 +81,7 @@ #include "doomstat.h" #include "r_utility.h" #include "g_levellocals.h" +#include "s_sound.h" #include "stats.h" #include "st_start.h" @@ -1060,6 +1061,7 @@ void DoMain (HINSTANCE hInstance) { I_ShutdownGraphics (); RestoreConView (); + S_StopMusic(true); I_FlushBufferedConsoleStuff(); if (error.GetMessage ()) {