Avoid crash with GTK3 if console program is linked to GUI library
A console program should not really be linked with the GUI library, but it used to work, and it's unavoidable with the monolithic build, so fix the regression. See #23981 (cherry picked from commit 4cabfa111ab5912ae30d6d44b917a9c403845b3f)
This commit is contained in:
parent
5560e59330
commit
1444565855
@ -13,6 +13,7 @@
|
||||
#include "wx/settings.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/app.h"
|
||||
#include "wx/toplevel.h"
|
||||
#include "wx/module.h"
|
||||
#endif
|
||||
@ -1210,6 +1211,10 @@ bool wxSystemSettingsModule::OnInit()
|
||||
|
||||
m_proxy = NULL;
|
||||
|
||||
wxAppConsole* app = wxAppConsole::GetInstance();
|
||||
if (!app || !app->IsGUI())
|
||||
return true;
|
||||
|
||||
// GTK_THEME environment variable overrides other settings
|
||||
if (getenv("GTK_THEME") == NULL)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user