diff --git a/CocoaSplit/CSTimedOutputBuffer.h b/CocoaSplit/CSTimedOutputBuffer.h
index b00760b0..f3569590 100644
--- a/CocoaSplit/CSTimedOutputBuffer.h
+++ b/CocoaSplit/CSTimedOutputBuffer.h
@@ -29,7 +29,7 @@
 @property (assign) float bufferDuration;
 @property (strong) NSString *name;
 @property (strong) CSIRCompressor *compressor;
-
+@property (assign) bool buffer_draining;
 -(void) writeCurrentBuffer:(NSString *)toFile;
 -(void) writeCurrentBuffer:(NSString *)toFile withCompletionBlock:(void (^)(void))completionBlock;
 -(void) writeCurrentBuffer:(NSString *)toFile usingDuration:(float)seconds_to_write withCompletionBlock:(void (^)(void))completionBlock;
diff --git a/CocoaSplit/CaptureController.m b/CocoaSplit/CaptureController.m
index 0a00f588..1281886a 100644
--- a/CocoaSplit/CaptureController.m
+++ b/CocoaSplit/CaptureController.m
@@ -1376,12 +1376,13 @@ NSString *const CSAppearanceSystem = @"CSAppearanceSystem";
     if (useRecorder)
     {
         [useRecorder stopRecordingForOutput:output];
-        [layout clearSourceList];
         //output.active = NO;
         if (self.mainLayoutRecorder)
         {
             output.settingsController = self.mainLayoutRecorder;
         }
+    } else {
+        [layout clearSourceList];
     }
 }