Do not restart sessions without state. Fixes blinksh#427

tocheskey · Feb 3, 2018 · 09a04ba · 09a04ba
1 parent 0fb7851
commit 09a04ba
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 9 deletions.
diff --git a/Blink/TermController.m b/Blink/TermController.m
@@ -274,11 +274,16 @@ - (void)reload
 
 - (void)suspend
 {
+  [_sessionParameters cleanEncodedState];
   [_session suspend];
 }
 
 - (void)resume
 {
+  if (![_sessionParameters hasEncodedState]) {
+    return;
+  }
+
   [self destroyPTY];
   [self createPTY];
   [self startSession];

diff --git a/Sessions/MCPSession.m b/Sessions/MCPSession.m
@@ -458,11 +458,7 @@ - (void)kill
 
 - (void)suspend
 {
-  if (_childSession == nil) {
-    [self out:@"\r\n".UTF8String];
-  } else {
-    [_childSession suspend];
-  }
+  [_childSession suspend];
 }
 
 @end
diff --git a/Sessions/MCPSessionParameters.h b/Sessions/MCPSessionParameters.h
@@ -19,5 +19,7 @@
 @property NSString *fontName;
 @property NSString *themeName;
 
+- (BOOL)hasEncodedState;
+
 @end
 
diff --git a/Sessions/MCPSessionParameters.m b/Sessions/MCPSessionParameters.m
@@ -78,5 +78,16 @@ + (BOOL)supportsSecureCoding
   return YES;
 }
 
+- (BOOL)hasEncodedState
+{
+  return _childSessionParameters.encodedState;
+}
+
+- (void)cleanEncodedState
+{
+  [_childSessionParameters cleanEncodedState];
+  [super cleanEncodedState];
+}
+
 @end
 
diff --git a/Sessions/Session.h b/Sessions/Session.h
@@ -69,6 +69,7 @@ typedef struct SessionParams {
 
 @property (strong, atomic) SessionParameters *sessionParameters;
 @property TermStream *stream;
+
 @property (weak) NSObject<SessionDelegate>* delegate;
 
 - (id)init __unavailable;

diff --git a/Sessions/Session.m b/Sessions/Session.m
@@ -179,8 +179,4 @@ - (void)suspend
 {
 }
 
-- (void)resume
-{
-}
-
 @end
diff --git a/Sessions/SessionParameters.h b/Sessions/SessionParameters.h
@@ -10,4 +10,6 @@
 
 @interface SessionParameters: NSObject<NSSecureCoding>
 @property NSData *encodedState;
+
+- (void)cleanEncodedState;
 @end
diff --git a/Sessions/SessionParameters.m b/Sessions/SessionParameters.m
@@ -52,4 +52,9 @@ + (BOOL)supportsSecureCoding
   return YES;
 }
 
+- (void)cleanEncodedState
+{
+  _encodedState = nil;
+}
+
 @end
-Original file line number
+Diff line change
@@ Expand Up / @@ -179,8 +179,4 @@ - (void)suspend @@
     {
     }
-    - (void)resume
-    {
-    }
     @end