[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/network/kbluetooth/src
From:       Alex Fiestas <alex () eyeos ! org>
Date:       2009-11-05 1:16:55
Message-ID: 1257383815.331239.21692.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1044952 by afiestas:

Fix a crash that appear because a incorrect shutdown of openobex server. This should \
fix alot of related crasahes :)

 M  +1 -0      obexserver/obexserver.cpp  
 M  +8 -1      trayicon.cpp  
 M  +1 -0      trayicon.h  


--- trunk/playground/network/kbluetooth/src/obexserver/obexserver.cpp \
#1044951:1044952 @@ -66,6 +66,7 @@
 
 ObexServer::~ObexServer() 
 {
+	kDebug() << "Destructing obexServer :/";
 	if(session)
 		delete session;
 	delete manager;
--- trunk/playground/network/kbluetooth/src/trayicon.cpp #1044951:1044952
@@ -311,7 +311,8 @@
 	}
 
 	if(server) {
-		server->stop();
+		server->close();
+		connect(server,SIGNAL(closed()),this,SLOT(obexServerClosed()));
 	}
 
 	if(serversession) {
@@ -323,6 +324,12 @@
 
 }
 
+void KBlueTray::obexServerClosed()
+{
+	delete server;
+	server = 0;
+}
+
 void KBlueTray::updateTooltip() {
 	kDebug() << "Updating Tooltip";	
 	if(!online) {
--- trunk/playground/network/kbluetooth/src/trayicon.h #1044951:1044952
@@ -182,5 +182,6 @@
 	void lockEnabled();
 	void lockDisabled();
 	void lockReady();
+	void obexServerClosed();
 };
 #endif


[prev in list] [next in list] [prev in thread] [next in thread]