From 9ab504a739935f26ac56b4d91583e0d282912238 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 10 Nov 2022 21:54:32 +0200 Subject: [PATCH] allocate the ARGB visuals and colormaps only if XRender is to be used they are null-checked in qt_cleanup() and used only when qt_x11Data->use_xrender equals true Signed-off-by: Ivailo Monev --- src/gui/kernel/qapplication_x11.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 3212337b7..3747093b7 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -1016,8 +1016,6 @@ void qt_init(QApplicationPrivate *priv, Display *display, qt_x11Data->screenCount = ScreenCount(qt_x11Data->display); qt_x11Data->screens = new QX11InfoData[qt_x11Data->screenCount]; - qt_x11Data->argbVisuals = new Visual *[qt_x11Data->screenCount]; - qt_x11Data->argbColormaps = new Colormap[qt_x11Data->screenCount]; for (int s = 0; s < qt_x11Data->screenCount; s++) { QX11InfoData *screen = qt_x11Data->screens + s; @@ -1074,6 +1072,8 @@ void qt_init(QApplicationPrivate *priv, Display *display, #ifndef QT_NO_XRENDER if (qt_x11Data->use_xrender) { + qt_x11Data->argbVisuals = new Visual *[qt_x11Data->screenCount]; + qt_x11Data->argbColormaps = new Colormap[qt_x11Data->screenCount]; for (int s = 0; s < qt_x11Data->screenCount; s++) { qt_x11Data->argbVisuals[s] = 0; qt_x11Data->argbColormaps[s] = 0; -- 2.11.0