From 367fa7b07b11fa828c18a38b3a214acab7648f4b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 30 Jul 2015 17:20:22 -0700
Subject: [PATCH] fixes for assert in Connection and ControlPacket create

---
 libraries/networking/src/udt/Connection.cpp    | 2 +-
 libraries/networking/src/udt/ControlPacket.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/networking/src/udt/Connection.cpp b/libraries/networking/src/udt/Connection.cpp
index 8f6d9a2812..e26f524c31 100644
--- a/libraries/networking/src/udt/Connection.cpp
+++ b/libraries/networking/src/udt/Connection.cpp
@@ -76,7 +76,7 @@ void Connection::sendACK(bool wasCausedBySyncTimeout) {
     auto currentTime = high_resolution_clock::now();
     
     SequenceNumber nextACKNumber = nextACK();
-    Q_ASSERT_X(nextACKNumber < _lastSentACK, "Connection::sendACK", "Sending lower ACK, something is wrong");
+    Q_ASSERT_X(nextACKNumber >= _lastSentACK, "Connection::sendACK", "Sending lower ACK, something is wrong");
     
     if (nextACKNumber == _lastSentACK) {
         // We already sent this ACK, but check if we should re-send it.
diff --git a/libraries/networking/src/udt/ControlPacket.cpp b/libraries/networking/src/udt/ControlPacket.cpp
index 7378b2f314..626e126c03 100644
--- a/libraries/networking/src/udt/ControlPacket.cpp
+++ b/libraries/networking/src/udt/ControlPacket.cpp
@@ -46,12 +46,12 @@ std::unique_ptr<ControlPacket> ControlPacket::create(Type type, qint64 size) {
     std::unique_ptr<ControlPacket> controlPacket;
     
     if (size == -1) {
-        return ControlPacket::create(type);
+        return std::unique_ptr<ControlPacket>(new ControlPacket(type));
     } else {
         // Fail with invalid size
         Q_ASSERT(size >= 0);
         
-        return ControlPacket::create(type, size);
+        return std::unique_ptr<ControlPacket>(new ControlPacket(type, size));
     }
 }