Merge pull request #13572 from dbeaver/npeImage#12657

#12657 do not read image if widget is disposed

Merge pull request #13572 from dbeaver/npeImage#12657
#12657 do not read image if widget is disposed
e26a61ce · Serge Rider · GitHub · 50805886 · cf70f1c9 · e26a61ce
隐藏空白更改
内联并排

Showing with 5 addition and 1 deletion

plugins/org.jkiss.dbeaver.ui.editors.image/src/org/jkiss/dbeaver/ui/data/managers/image/ImagePanelEditor.java ...kiss/dbeaver/ui/data/managers/image/ImagePanelEditor.java +5 -1

未找到文件。
--- a/plugins/org.jkiss.dbeaver.ui.editors.image/src/org/jkiss/dbeaver/ui/data/managers/image/ImagePanelEditor.java
+++ b/plugins/org.jkiss.dbeaver.ui.editors.image/src/org/jkiss/dbeaver/ui/data/managers/image/ImagePanelEditor.java
@@ -53,7 +53,11 @@ public class ImagePanelEditor implements IStreamValueEditor<ImageViewer> {
                if (!(new UITask<Boolean>() {
                    @Override
                    protected Boolean runTask() {
-                        return control.loadImage(contentStream);
+                        if (!control.isDisposed()) {
+                            return control.loadImage(contentStream);
+                        } else {
+                            return true; // already read
+                        }
                    }
                }).execute())
                {