Skip to content

Commit c3547a0

Browse files
committed
Fix - make more strong checks, obj === null is not good enough
1 parent 2981582 commit c3547a0

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

scripts/JSRootPainter.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3224,8 +3224,9 @@
32243224
var svg_p = this.svg_pad();
32253225
if (svg_p.empty()) return;
32263226

3227-
if (svg_p.property('pad_painter') !== this)
3228-
svg_p.property('pad_painter').painters.push(this);
3227+
var pp = svg_p.property('pad_painter');
3228+
if (pp && (pp !== this))
3229+
pp.painters.push(this);
32293230

32303231
if (((is_main === 1) || (is_main === 4) || (is_main === 5)) && !svg_p.property('mainpainter'))
32313232
// when this is first main painter in the pad
@@ -4007,7 +4008,7 @@
40074008
TObjectPainter.prototype.FindInPrimitives = function(objname) {
40084009

40094010
var painter = this.pad_painter();
4010-
if ((painter === null) || (painter.pad === null)) return null;
4011+
if (!painter || !painter.pad) return null;
40114012

40124013
if (painter.pad.fPrimitives)
40134014
for (var n=0;n<painter.pad.fPrimitives.arr.length;++n) {
@@ -4025,7 +4026,7 @@
40254026
TObjectPainter.prototype.FindPainterFor = function(selobj,selname,seltype) {
40264027

40274028
var painter = this.pad_painter();
4028-
var painters = (painter === null) ? null : painter.painters;
4029+
var painters = painter ? painter.painters : null;
40294030
if (!painters) return null;
40304031

40314032
for (var n = 0; n < painters.length; ++n) {

0 commit comments

Comments
 (0)