Skip to content

Commit 58d483a

Browse files
arch1t3chtmojie126
authored andcommitted
Fix wxWidgets check for EGL support
Since wxWidgets's d9df7db130ac22a6691bc4eb73ad0f691e999d7b, wxWidgets can be compiled with both GLX and EGL at the same time, in which case the old check no longer works.
1 parent 41a7e75 commit 58d483a

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ AegisubApp::AegisubApp() {
101101

102102
// Fallback to X11 if wxGTK implementation is build without Wayland EGL support
103103
// Fix https://github.com/TypesettingTools/Aegisub/issues/233
104-
#if defined(__WXGTK__) && !wxUSE_GLCANVAS_EGL
104+
#if defined(__WXGTK__) && !wxUSE_GLCANVAS_EGL && !wxHAS_EGL
105105
wxString xdg_session_type = wxGetenv("XDG_SESSION_TYPE");
106106
wxString wayland_display = wxGetenv("WAYLAND_DISPLAY");
107107

0 commit comments

Comments
 (0)