[asimage] fix check condition for batch and memleak

ferdymercury · web-flow · commit e7516a96de07 · 2026-04-13T10:20:07.000+02:00
diff --git a/graf2d/asimage/src/TASImage.cxx b/graf2d/asimage/src/TASImage.cxx
@@ -2236,7 +2236,7 @@ Bool_t TASImage::InitVisual()
       fgBatch = false;
    }
 
-   if (fgVisual && fgVisual->dpy) { // already initialized
+   if (fgVisual && (fgVisual->dpy || fgBatch)) { // already initialized
       return kTRUE;
    }
 
@@ -2261,6 +2261,7 @@ Bool_t TASImage::InitVisual()
    Colormap cmap = (Colormap) gVirtualX->GetColormap();
 
    if (!vis || cmap == 0) {
+      destroy_asvisual(fgVisual, kFALSE);
       fgVisual = create_asvisual(nullptr, 0, 0, nullptr);
    } else {
       fgVisual = create_asvisual_for_id(disp, screen, depth,

Original file line number	Diff line number	Diff line change
`@@ -2236,7 +2236,7 @@ Bool_t TASImage::InitVisual()`
`2236`	`2236`	`fgBatch = false;`
`2237`	`2237`	`}`
`2238`	`2238`
`2239`		`- if (fgVisual && fgVisual->dpy) { // already initialized`
	`2239`	`+ if (fgVisual && (fgVisual->dpy \|\| fgBatch)) { // already initialized`
`2240`	`2240`	`return kTRUE;`
`2241`	`2241`	`}`
`2242`	`2242`
`@@ -2261,6 +2261,7 @@ Bool_t TASImage::InitVisual()`
`2261`	`2261`	`Colormap cmap = (Colormap) gVirtualX->GetColormap();`
`2262`	`2262`
`2263`	`2263`	`if (!vis \|\| cmap == 0) {`
	`2264`	`+ destroy_asvisual(fgVisual, kFALSE);`
`2264`	`2265`	`fgVisual = create_asvisual(nullptr, 0, 0, nullptr);`
`2265`	`2266`	`} else {`
`2266`	`2267`	`fgVisual = create_asvisual_for_id(disp, screen, depth,`