summaryrefslogtreecommitdiff
path: root/noncore/net
Side-by-side diff
Diffstat (limited to 'noncore/net') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index dd8a365..09a44e6 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -106,7 +106,7 @@ Wellenreiter::Wellenreiter( QWidget* parent )
int flags;
flags = fcntl( daemon_fd, F_GETFL, 0 );
fcntl( daemon_fd, F_SETFL, flags | O_NONBLOCK );
- QSocketNotifier *sn = new QSocketNotifier( daemon_fd, QSocketNotifier::Read, parent );
+ QSocketNotifier *sn = new QSocketNotifier( daemon_fd, QSocketNotifier::Read, this );
connect( sn, SIGNAL( activated( int ) ), this, SLOT( dataReceived() ) );
}
@@ -124,18 +124,13 @@ Wellenreiter::~Wellenreiter()
delete manufacturerdb;
- // X11-only - Hmm... Closing the socket here segfaults on exit,
- // Maybe because the notifier still has a handle to it!? Seems not to
- // occur on Qt/Embedded
-
- #ifdef QWS
if ( daemon_fd != -1 )
{
qDebug( "closing comm socket" );
- close( daemon_fd );
+ ::shutdown( daemon_fd, 0 );
+ ::close( daemon_fd );
+ qDebug( "comm socket closed." );
}
- #endif
-
}
void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw )