Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:37:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5936 from birarda/tv-es-lockup

Browse source 
fix a timer leak, line width in PacketList
This commit is contained in:
Brad Hefta-Gaub 2015-10-01 14:39:40 -07:00
commit f2e65f5a98
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/networking/src/ThreadedAssignment.cpp
View file

@ -49,7 +49,8 @@ void ThreadedAssignment::setFinished(bool isFinished) {
} }
if (_statsTimer) { if (_statsTimer) {
_statsTimer->stop(); _statsTimer->deleteLater();
_statsTimer = nullptr;
} }
// call our virtual aboutToFinish method - this gives the ThreadedAssignment subclass a chance to cleanup // call our virtual aboutToFinish method - this gives the ThreadedAssignment subclass a chance to cleanup
@ -105,7 +106,7 @@ void ThreadedAssignment::sendStatsPacket() {
void ThreadedAssignment::startSendingStats() { void ThreadedAssignment::startSendingStats() {
// send the stats packet every 1s // send the stats packet every 1s
if (!_statsTimer) { if (!_statsTimer) {
_statsTimer = new QTimer(); _statsTimer = new QTimer;
connect(_statsTimer, &QTimer::timeout, this, &ThreadedAssignment::sendStatsPacket); connect(_statsTimer, &QTimer::timeout, this, &ThreadedAssignment::sendStatsPacket);
} }

3
libraries/networking/src/udt/PacketList.h
View file

@ -28,7 +28,8 @@ class Packet;
class PacketList : public QIODevice { class PacketList : public QIODevice {
Q_OBJECT Q_OBJECT
public: public:
static std::unique_ptr<PacketList> create(PacketType packetType, QByteArray extendedHeader = QByteArray(), bool isReliable = false, bool isOrdered = false); static std::unique_ptr<PacketList> create(PacketType packetType, QByteArray extendedHeader = QByteArray(),
bool isReliable = false, bool isOrdered = false);
static std::unique_ptr<PacketList> fromReceivedPackets(std::list<std::unique_ptr<Packet>>&& packets); static std::unique_ptr<PacketList> fromReceivedPackets(std::list<std::unique_ptr<Packet>>&& packets);
bool isReliable() const { return _isReliable; } bool isReliable() const { return _isReliable; }