From f4bc3f8e388a6b38456f880dd7a3904150dae072 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 29 Sep 2015 16:35:24 -0400 Subject: [PATCH] fix a timer leak, line width in PacketList --- libraries/networking/src/ThreadedAssignment.cpp | 5 +++-- libraries/networking/src/udt/PacketList.h | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/networking/src/ThreadedAssignment.cpp b/libraries/networking/src/ThreadedAssignment.cpp index 5f0db9412c..0422c03297 100644 --- a/libraries/networking/src/ThreadedAssignment.cpp +++ b/libraries/networking/src/ThreadedAssignment.cpp @@ -49,7 +49,8 @@ void ThreadedAssignment::setFinished(bool isFinished) { } if (_statsTimer) { - _statsTimer->stop(); + _statsTimer->deleteLater(); + _statsTimer = nullptr; } // call our virtual aboutToFinish method - this gives the ThreadedAssignment subclass a chance to cleanup @@ -105,7 +106,7 @@ void ThreadedAssignment::sendStatsPacket() { void ThreadedAssignment::startSendingStats() { // send the stats packet every 1s if (!_statsTimer) { - _statsTimer = new QTimer(); + _statsTimer = new QTimer; connect(_statsTimer, &QTimer::timeout, this, &ThreadedAssignment::sendStatsPacket); } diff --git a/libraries/networking/src/udt/PacketList.h b/libraries/networking/src/udt/PacketList.h index ae783dabe3..7978e77ad7 100644 --- a/libraries/networking/src/udt/PacketList.h +++ b/libraries/networking/src/udt/PacketList.h @@ -28,7 +28,8 @@ class Packet; class PacketList : public QIODevice { Q_OBJECT public: - static std::unique_ptr create(PacketType packetType, QByteArray extendedHeader = QByteArray(), bool isReliable = false, bool isOrdered = false); + static std::unique_ptr create(PacketType packetType, QByteArray extendedHeader = QByteArray(), + bool isReliable = false, bool isOrdered = false); static std::unique_ptr fromReceivedPackets(std::list>&& packets); bool isReliable() const { return _isReliable; }