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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/jabber/googletalk
From:       Pali Rohár <pali.rohar () gmail ! com>
Date:       2013-06-01 21:55:59
Message-ID: 20130601215600.00BC7AC85D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1356757 by pali:

Fix crashing Kopete compiled with jabber google talk support when exiting

BUG: 319215
BUG: 251226
BUG: 265295
FIXED-IN: 4.11


 M  +8 -1      googletalk.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/jabber/googletalk/googletalk.cpp #1356756:1356757
@@ -73,7 +73,7 @@
 GoogleTalk::~GoogleTalk() {
 
 //	qDebug() << "GoogleTalk::~GoogleTalk";
-	logout();
+	logout("destruct");
 
 	delete timer;
 	delete callProcess;
@@ -155,6 +155,13 @@
 
 		c = false;
 
+		if ( res == "destruct" ) {
+
+			callProcess->terminate();
+			return;
+
+		}
+
 		QEventLoop * loop = new QEventLoop;
 		QTimer * quitTimer = new QTimer;
 
[prev in list] [next in list] [prev in thread] [next in thread]