move common code in one place

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20513 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago · 9807aab483
parent ba7c8dbd73
commit 9807aab483
1 changed files with 2 additions and 4 deletions
--- a/channel.c
+++ b/channel.c
@ -3943,8 +3943,6 @@ struct ast_frame *ast_channel_spy_read_frame(struct ast_channel_spy *spy, unsign
 			result = spy->read_queue.head;
 			spy->read_queue.head = NULL;
 			spy->read_queue.samples = 0;
-			ast_clear_flag(spy, CHANSPY_TRIGGER_FLUSH);
-			return result;
 		} else {
 			if (ast_test_flag(spy, CHANSPY_WRITE_VOLADJUST)) {
 				for (result = spy->write_queue.head; result; result = result->next)
@ -3953,10 +3951,10 @@ struct ast_frame *ast_channel_spy_read_frame(struct ast_channel_spy *spy, unsign
 			result = spy->write_queue.head;
 			spy->write_queue.head = NULL;
 			spy->write_queue.samples = 0;
+		}
 		ast_clear_flag(spy, CHANSPY_TRIGGER_FLUSH);
 		return result;
 	}
-	}

 	if ((spy->read_queue.samples < samples) || (spy->write_queue.samples < samples))
 		return NULL;