From 10e7e45ae92d4fe06f70126ed256b87896dbc432 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Wed, 29 Oct 2008 19:46:57 +0000 Subject: better solution to add possibility to delete eSocketNotifiers, eConsoleAppContainers in callback funktions without crash --- lib/network/socket.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'lib/network/socket.cpp') diff --git a/lib/network/socket.cpp b/lib/network/socket.cpp index b2ab7437..162ead81 100644 --- a/lib/network/socket.cpp +++ b/lib/network/socket.cpp @@ -10,7 +10,6 @@ void eSocket::close() if (writebuffer.empty()) { int wasconnected=(mystate==Connection) || (mystate==Closing); - delete rsn; rsn=0; ::close(socketdesc); socketdesc=-1; @@ -87,9 +86,8 @@ int eSocket::setSocket(int s, int iss, eMainloop *ml) fcntl(socketdesc, F_SETFL, O_NONBLOCK); last_break = 0xFFFFFFFF; - if (rsn) - delete rsn; - rsn=new eSocketNotifier(ml, getDescriptor(), + rsn = 0; + rsn=eSocketNotifier::create(ml, getDescriptor(), eSocketNotifier::Read|eSocketNotifier::Hungup); CONNECT(rsn->activated, eSocket::notifier); return 0; @@ -278,7 +276,7 @@ eSocket::eSocket(eMainloop *ml): readbuffer(32768), writebuffer(32768), rsn(0) setSocket(s, 1, ml); } -eSocket::eSocket(int socket, int issocket, eMainloop *ml): readbuffer(32768), writebuffer(32768), rsn(0) +eSocket::eSocket(int socket, int issocket, eMainloop *ml): readbuffer(32768), writebuffer(32768) { setSocket(socket, issocket, ml); mystate=Connection; @@ -286,8 +284,6 @@ eSocket::eSocket(int socket, int issocket, eMainloop *ml): readbuffer(32768), wr eSocket::~eSocket() { - if (rsn) - delete rsn; if(socketdesc>=0) { ::close(socketdesc); -- cgit v1.2.3