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

List:       kde-commits
Subject:    extragear/utils/yakuake
From:       Eike Hein <hein () kde ! org>
Date:       2009-03-19 20:45:57
Message-ID: 1237495557.960413.17257.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 941517 by hein:

Fix crashes when closing sessions with certain split setups (also on quit).


 M  +1 -0      ChangeLog  
 M  +6 -0      app/terminal.cpp  
 M  +2 -0      app/terminal.h  


--- trunk/extragear/utils/yakuake/ChangeLog #941516:941517
@@ -19,6 +19,7 @@
   cut configuration dialog (the required API is new in 4.2). The reason
   multi-key global shortcuts are not allowed in KDE is that they don't work.
 * Added D-Bus interfaces for splitting.
+* Fix crashes when closing sessions with certain split setups (also on quit).
 
 
 Changes in 2.9.4:
--- trunk/extragear/utils/yakuake/app/terminal.cpp #941516:941517
@@ -68,6 +68,7 @@
 
         if (m_terminalWidget)
         {
+            connect(m_terminalWidget, SIGNAL(destroyed()), this, SLOT(terminalWidgetDestroyed()));
             m_terminalWidget->setFocusPolicy(Qt::WheelFocus);
             m_terminalWidget->installEventFilter(this);
         }
@@ -94,6 +95,11 @@
         deleteLater();
 }
 
+void Terminal::terminalWidgetDestroyed()
+{
+    m_terminalWidget = NULL;
+}
+
 bool Terminal::eventFilter(QObject* /* watched */, QEvent* event)
 {
     if (event->type() == QEvent::FocusIn)
--- trunk/extragear/utils/yakuake/app/terminal.h #941516:941517
@@ -71,7 +71,9 @@
         void setTitle(const QString& title);
         void overrideShortcut(QKeyEvent* event, bool& override);
 
+        void terminalWidgetDestroyed();
 
+
     private:
         void disableOffendingPartActions();
 
[prev in list] [next in list] [prev in thread] [next in thread]