From 75678de4ec7745dcc616305f70fa85ef53601a02 Mon Sep 17 00:00:00 2001
From: Alisa Mylnikova <f3dm76@gmail.com>
Date: Wed, 10 Jun 2020 15:40:50 +0700
Subject: [PATCH] Try to fix mac build

---
 Source/svg/SVGParser.swift   | 6 +++---
 Source/views/MacawView.swift | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Source/svg/SVGParser.swift b/Source/svg/SVGParser.swift
index 6c79ea89..facdd4d9 100644
--- a/Source/svg/SVGParser.swift
+++ b/Source/svg/SVGParser.swift
@@ -547,7 +547,7 @@ open class SVGParser {
                 scanner.scanString("(", into: nil),
                 let valuesString = scanner.scannedUpToString(")"),
                 scanner.scanString(")", into: nil) else {
-                break stopParse
+                    break stopParse
             }
 
             // Skip an optional comma after ")".
@@ -1148,7 +1148,7 @@ open class SVGParser {
                             baseline: .alphabetic,
                             place: place,
                             opacity: opacity)
-            } else if let tspanElement = element as? XMLElement,
+            } else if let tspanElement = element as? SWXMLHash.XMLElement,
                 tspanElement.name == "tspan" {
                 // parse as <tspan> element
                 // ultimately skip it if it cannot be parsed
@@ -1179,7 +1179,7 @@ open class SVGParser {
         return collection
     }
 
-    fileprivate func parseTspan(_ element: XMLElement,
+    fileprivate func parseTspan(_ element: SWXMLHash.XMLElement,
                                 withWhitespace: Bool = false,
                                 textAnchor: String?,
                                 fill: Fill?,
diff --git a/Source/views/MacawView.swift b/Source/views/MacawView.swift
index be4becd0..aea5ee95 100644
--- a/Source/views/MacawView.swift
+++ b/Source/views/MacawView.swift
@@ -59,12 +59,10 @@ open class MacawView: MView, MGestureRecognizerDelegate {
     #if os(OSX)
     open override var layer: CALayer? {
         didSet {
-            guard self.layer != nil else {
-                return
+            if self.layer == nil {
+                initializeView()
+                renderer = RenderUtils.createNodeRenderer(node, view: drawingView)
             }
-            initializeView()
-
-            renderer = RenderUtils.createNodeRenderer(node, view: drawingView)
         }
     }
     #endif