From 9af936514ec4b9c03045d04e5ea980637bd2dcbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrg=20Lehni?= <juerg@scratchdisk.com>
Date: Sat, 4 Feb 2017 20:14:35 +0100
Subject: [PATCH] Minor code cleanups.

---
 src/path/PathItem.Boolean.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/path/PathItem.Boolean.js b/src/path/PathItem.Boolean.js
index 00dc57f9..94b36fbf 100644
--- a/src/path/PathItem.Boolean.js
+++ b/src/path/PathItem.Boolean.js
@@ -137,7 +137,7 @@ PathItem.inject(new function() {
             for (var i = 0, l = segments.length; i < l; i++) {
                 var segment = segments[i],
                     inter = segment._intersection;
-                if (segment._winding == null) {
+                if (!segment._winding) {
                     propagateWinding(segment, _path1, _path2, curves, operator);
                 }
                 // See if all encountered segments in a path are overlaps.
@@ -275,9 +275,10 @@ PathItem.inject(new function() {
                     // different "insideness" and set opposite orientation.
                     if (path2.contains(point)) {
                         var entry2 = lookup[path2._id];
+                        containerWinding = entry2.winding;
+                        entry1.winding += containerWinding;
                         entry1.container = entry2.exclude ? entry2.container
                                 : path2;
-                        entry1.winding += (containerWinding = entry2.winding);
                         break;
                     }
                 }
@@ -713,15 +714,17 @@ PathItem.inject(new function() {
 
         function isValid(seg) {
             var winding;
-            return !!(seg && !seg._visited && (!operator
-                    || operator[(winding = seg._winding || {}).winding]
-                    // Unite operations need special handling of segments with a
-                    // winding contribution of two (part of both involved areas)
-                    // which are only valid if they are part of the contour of
-                    // the result, not contained inside another area.
-                    && !(operator.unite && winding.winding === 2
-                        // No contour if both windings are non-zero.
-                        && winding.windingL && winding.windingR)));
+            var res = !!(seg && !seg._visited && (!operator
+                    || operator[(winding = seg._winding).winding]
+                        // Unite operations need special handling of segments
+                        // with a winding contribution of two (part of both
+                        // areas), which are only valid if they are part of the
+                        // result's contour, not contained inside another area.
+                        && !(operator.unite && winding.winding === 2
+                            // No contour if both windings are non-zero.
+                            && winding.windingL && winding.windingR)));
+            console.log(seg && seg._winding);
+            return res;
         }
 
         function isStart(seg) {