Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index c8d77a7..fff7c35 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -86,12 +86,13 @@ Wellenreiter::Wellenreiter( QWidget* parent ) | |||
86 | #endif | 86 | #endif |
87 | 87 | ||
88 | netview->setColumnWidthMode( 1, QListView::Manual ); | 88 | netview->setColumnWidthMode( 1, QListView::Manual ); |
89 | connect( netview, SIGNAL( joinNetwork(const QString&,const QString&,int,const QString&) ), | 89 | connect( netview, SIGNAL( joinNetwork(const QString&,const QString&,int,const QString&) ), |
90 | this, SLOT( joinNetwork(const QString&,const QString&,int,const QString&) ) ); | 90 | this, SLOT( joinNetwork(const QString&,const QString&,int,const QString&) ) ); |
91 | pcap = new OPacketCapturer(); | 91 | pcap = new OPacketCapturer(); |
92 | pcap->setAutoDelete( false ); | ||
92 | 93 | ||
93 | gps = new GPS( this ); | 94 | gps = new GPS( this ); |
94 | 95 | ||
95 | QTimer::singleShot( 1000, this, SLOT( initialTimer() ) ); | 96 | QTimer::singleShot( 1000, this, SLOT( initialTimer() ) ); |
96 | 97 | ||
97 | } | 98 | } |
@@ -657,13 +658,15 @@ void Wellenreiter::timerEvent( QTimerEvent* ) | |||
657 | { | 658 | { |
658 | stopClicked(); | 659 | stopClicked(); |
659 | } | 660 | } |
660 | else | 661 | else |
661 | { | 662 | { |
662 | receivePacket( p ); | 663 | receivePacket( p ); |
663 | delete p; | 664 | // We no longer delete packets here. Ownership of the packets is |
665 | // transferred to the PacketView. | ||
666 | //delete p; | ||
664 | } | 667 | } |
665 | } | 668 | } |
666 | 669 | ||
667 | 670 | ||
668 | void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* p ) | 671 | void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* p ) |
669 | { | 672 | { |