From 4ea2ccd526161125381fa4e60cb52195db1c1f06 Mon Sep 17 00:00:00 2001
From: Lucas Clemente <lclemente@google.com>
Date: Fri, 9 Jun 2017 14:28:06 +0200
Subject: [PATCH] Improve STOP_WAITING detection in packet packer

---
 packet_packer.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packet_packer.go b/packet_packer.go
index 7d52b1943..6e547500c 100644
--- a/packet_packer.go
+++ b/packet_packer.go
@@ -141,8 +141,10 @@ func (p *packetPacker) packPacket(stopWaitingFrame *frames.StopWaitingFrame, lea
 		return nil, nil
 	}
 	// Don't send out packets that only contain a StopWaitingFrame
-	if len(payloadFrames) == 1 && stopWaitingFrame != nil {
-		return nil, nil
+	if len(payloadFrames) == 1 {
+		if _, ok := payloadFrames[0].(*frames.StopWaitingFrame); ok {
+			return nil, nil
+		}
 	}
 
 	raw := getPacketBuffer()