1 files changed, 8 insertions, 0 deletions

diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 1ccf971..dd8a365 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -102,53 +102,61 @@ Wellenreiter::Wellenreiter( QWidget* parent )
         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 );
         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 );
     }
+    #endif
+
 }
 
 void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw )
 {
     configwindow = cw;
 }
 
 void Wellenreiter::handleMessage()
 {
     // FIXME: receive message and handle it
 
     qDebug( "received message from daemon." );
 
     /*char buffer[10000];
     memset( &buffer, 0, sizeof( buffer ) );*/
     
     char buffer[WL_SOCKBUF];
 
     // int result = #wl_recv( &daemon_fd, (char*) &buffer, sizeof(buffer) );
     
     /*
     
     struct sockaddr from;
     socklen_t len;