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
@@ -97,54 +97,49 @@ Wellenreiter::Wellenreiter( QWidget* parent )
 
     // struct sockaddr_in sockaddr;
     daemon_fd = wl_setupsock( GUIADDR, GUIPORT, sockaddr );
     if ( daemon_fd == -1 )
     {
         logwindow->log( "(E) Couldn't get file descriptor for commsocket." );
     }
     else
     {
         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() ) );
     }
 
     // setup GUI
     netview->setColumnWidthMode( 1, QListView::Manual );
 
     if ( manufacturerdb )
         netview->setManufacturerDB( manufacturerdb );
 
 }
 
 Wellenreiter::~Wellenreiter()
 {
     // no need to delete child widgets, Qt does it all for us
 
     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 )
 {
     configwindow = cw;
 }
 
 void Wellenreiter::handleMessage()
 {
     // FIXME: receive message and handle it
 
     qDebug( "received message from daemon." );