Set appearance from start and after flag

jn7163 · Sep 8, 2016 · c4a2aa1 · c4a2aa1
1 parent 9877b83
commit c4a2aa1
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Blink/TermController.m b/Blink/TermController.m
@@ -47,6 +47,7 @@ @implementation TermController {
   int _pinput[2];
   MCPSession *_session;
   BOOL _viewIsLocked;
+  BOOL _appearanceChanged;
 }
 
 + (void)initialize
@@ -161,7 +162,9 @@ - (void)listenToControlEvents
 
 - (void) viewDidAppear:(BOOL)animated
 {
-  [self setAppearanceFromSettings];
+  if (_appearanceChanged) {
+    [self setAppearanceFromSettings];
+  }
 }
 
 - (void)setAppearanceFromSettings
@@ -225,6 +228,7 @@ - (void)userContentController:(WKUserContentController *)userContentController
   if ([operation isEqualToString:@"sigwinch"]) {
     [self updateTermRows:data[@"rows"] Cols:data[@"columns"]];
   } else if ([operation isEqualToString:@"terminalready"]) {
+    [self setAppearanceFromSettings];
     [self startSession];
   }
 }
@@ -315,7 +319,11 @@ - (void)keyboardFuncTriggerChanged:(NSNotification *)notification
 - (void)appearanceChanged:(NSNotification *)notification
 {
 //  NSDictionary *action = [notification userInfo];
-  [self setAppearanceFromSettings];
+  if (self.isViewLoaded && self.view.window) {
+    [self setAppearanceFromSettings];
+  } else {
+    _appearanceChanged = YES;
+  }
 }
 
 @end