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

List:       kde-commits
Subject:    =?utf-8?q?=5Blibdebconf-kde=5D_src=3A_Guard_DebconfFrontendSocke?=
From:       Modestas Vainius <modax () debian ! org>
Date:       2011-06-29 16:29:28
Message-ID: 20110629162928.E55AFA60C8 () git ! kde ! org
[Download RAW message or body]

Git commit ac58aaafe474b441a1587544ce7403657489132e by Modestas Vainius.
Committed on 27/06/2011 at 00:29.
Pushed by modax into branch 'master'.

Guard DebconfFrontendSocket::{reset,cancel}() from double execution.

Double execution might actually be possible if DebconfGui::disappeared() was
connected to QWidget::close(). So it is better be safe than sorry.

M  +7    -4    src/debconf.cpp     

http://commits.kde.org/libdebconf-kde/ac58aaafe474b441a1587544ce7403657489132e

diff --git a/src/debconf.cpp b/src/debconf.cpp
index d64d128..dbb3cf7 100644
--- a/src/debconf.cpp
+++ b/src/debconf.cpp
@@ -333,15 +333,18 @@ void DebconfFrontendSocket::newConnection()
 
 void DebconfFrontendSocket::reset()
 {
-    m_socket->deleteLater();
-    m_socket = 0;
-
+    if (m_socket) {
+        m_socket->deleteLater();
+        m_socket = 0;
+    }
     DebconfFrontend::reset();
 }
 
 void DebconfFrontendSocket::cancel()
 {
-    m_socket->disconnectFromServer();
+    if (m_socket) {
+        m_socket->disconnectFromServer();
+    }
     DebconfFrontend::cancel();
 }
 


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