Minor internal optimizations.

Author: alexmx

AMXFontAutoScale.podspec

@@ -2,7 +2,7 @@
 Pod::Spec.new do |s|
 
   s.name          = "AMXFontAutoScale"
-  s.version       = "1.1.0"
+  s.version       = "1.1.1"
   s.summary       = "Scale the font for UILabel and UITextView proportionally across all the screen sizes."
 
   s.description   = <<-DESC

AMXFontAutoScale/UILabel+AMXFontScale.m

@@ -103,16 +103,21 @@ + (void)load
 
 - (void)swizzle_willMoveToWindow:(UIWindow *)newWindow
 {
-    AMXScreenSize referenceScreenSize = AMXScreenSizeCurrent;
-    if (self.amx_autoScaleEnabled) {
-        referenceScreenSize = self.amx_referenceScreenSize;
-    } else if (self.class.amx_autoScaleEnabled && ![self wasInstanceAutoScaleSet]) {
-        referenceScreenSize = self.class.amx_referenceScreenSize;
+    if (newWindow) {
+        AMXScreenSize referenceScreenSize = AMXScreenSizeCurrent;
+        
+        if (self.amx_autoScaleEnabled) {
+            referenceScreenSize = self.amx_referenceScreenSize;
+        } else if (self.class.amx_autoScaleEnabled && ![self wasInstanceAutoScaleSet]) {
+            referenceScreenSize = self.class.amx_referenceScreenSize;
+        }
+        
+        if (referenceScreenSize != AMXScreenSizeCurrent) {
+            self.font = [self.font amx_scaleForReferenceScreenSize:referenceScreenSize
+                                                     updateHandler:self.amx_fontSizeUpdateHandler];
+        }
     }
 
-    self.font = [self.font amx_scaleForReferenceScreenSize:referenceScreenSize
-                                             updateHandler:self.amx_fontSizeUpdateHandler];
-    
     [self swizzle_willMoveToWindow:newWindow];
 }
 

AMXFontAutoScale/UITextView+AMXFontScale.m

@@ -103,16 +103,21 @@ + (void)load
 
 - (void)swizzle_willMoveToWindow:(UIWindow *)newWindow
 {
-    AMXScreenSize referenceScreenSize = AMXScreenSizeCurrent;
-    if (self.amx_autoScaleEnabled) {
-        referenceScreenSize = self.amx_referenceScreenSize;
-    } else if (self.class.amx_autoScaleEnabled && ![self wasInstanceAutoScaleSet]) {
-        referenceScreenSize = self.class.amx_referenceScreenSize;
+    if (newWindow) {
+        AMXScreenSize referenceScreenSize = AMXScreenSizeCurrent;
+        
+        if (self.amx_autoScaleEnabled) {
+            referenceScreenSize = self.amx_referenceScreenSize;
+        } else if (self.class.amx_autoScaleEnabled && ![self wasInstanceAutoScaleSet]) {
+            referenceScreenSize = self.class.amx_referenceScreenSize;
+        }
+        
+        if (referenceScreenSize != AMXScreenSizeCurrent) {
+            self.font = [self.font amx_scaleForReferenceScreenSize:referenceScreenSize
+                                                     updateHandler:self.amx_fontSizeUpdateHandler];
+        }
     }
 
-    self.font = [self.font amx_scaleForReferenceScreenSize:referenceScreenSize
-                                             updateHandler:self.amx_fontSizeUpdateHandler];
-    
     [self swizzle_willMoveToWindow:newWindow];
 }