moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-08-16 16:36:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deregister logging callbacks before destroying the logger

Browse Source
This commit is contained in:
Cameron Gutman 2025-07-04 15:56:11 -05:00
parent 504d42865d
commit 1bf86f52d3
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/main.cpp
View File

@ -360,11 +360,18 @@ int main(int argc, char *argv[])
// Serialize log messages on a single thread // Serialize log messages on a single thread
s_LoggerThread.setMaxThreadCount(1); s_LoggerThread.setMaxThreadCount(1);
s_LoggerTime.start(); s_LoggerTime.start();
qInstallMessageHandler(qtLogToDiskHandler);
SDL_LogSetOutputFunction(sdlLogToDiskHandler, nullptr);
// Register our logger with all libraries
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_SetLogOutputFunction(sdlLogToDiskHandler, nullptr);
#else
SDL_LogOutputFunction oldSdlLogFn;
void* oldSdlLogUserdata;
SDL_LogGetOutputFunction(&oldSdlLogFn, &oldSdlLogUserdata);
SDL_LogSetOutputFunction(sdlLogToDiskHandler, nullptr);
#endif
qInstallMessageHandler(qtLogToDiskHandler);
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
av_log_set_callback(ffmpegLogToDiskHandler); av_log_set_callback(ffmpegLogToDiskHandler);
#endif #endif
@ -802,6 +809,17 @@ int main(int argc, char *argv[])
// sometimes freezing and blocking process exit. // sometimes freezing and blocking process exit.
QThreadPool::globalInstance()->waitForDone(30000); QThreadPool::globalInstance()->waitForDone(30000);
// Restore the default logger for all libraries before shutting down ours
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_SetLogOutputFunction(SDL_GetDefaultLogOutputFunction(), nullptr);
#else
SDL_LogSetOutputFunction(oldSdlLogFn, oldSdlLogUserdata);
#endif
qInstallMessageHandler(nullptr);
#ifdef HAVE_FFMPEG
av_log_set_callback(av_log_default_callback);
#endif
// Wait for pending log messages to be printed // Wait for pending log messages to be printed
s_LoggerThread.waitForDone(); s_LoggerThread.waitForDone();