fix: multiple console log redirection, causes crash

rob2468 · Apr 4, 2020 · 0d44ccf · 0d44ccf
1 parent c38ce52
commit 0d44ccf
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/Classes/Core/Component/HSDConsoleLogComponent.m b/Classes/Core/Component/HSDConsoleLogComponent.m
@@ -54,18 +54,16 @@ - (void)redirectReadCompletionNotificationReceived:(NSNotification *)notificatio
 #pragma mark - state
 
 - (BOOL)isRedirected {
-    BOOL isRedirected;
-    if (self.stdErrFd == kStdErrIllegalFd) {
-        isRedirected = NO;
-    } else {
-        isRedirected = YES;
-    }
-    return isRedirected;
+    return self.stdErrFd != kStdErrIllegalFd;
 }
 
 #pragma mark -
 
 - (void)redirectStandardErrorOutput {
+    if ([self isRedirected]) {
+        return;
+    }
+
     // save origin STDERR_FILENO with a new file descriptor
     self.stdErrFd = dup(STDERR_FILENO);
 
@@ -84,6 +82,10 @@ - (void)redirectStandardErrorOutput {
 }
 
 -(void)recoverStandardErrorOutput {
+    if (![self isRedirected]) {
+        return;
+    }
+
     // remove observer
     [[NSNotificationCenter defaultCenter] removeObserver:self name:NSFileHandleReadCompletionNotification object:nil];