[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE_3_4_BRANCH: kdemultimedia/kmix
From: Luboš Luňák <l.lunak () kde ! org>
Date: 2005-04-29 13:41:05
Message-ID: 20050429134105.AC280629 () office ! kde ! org
[Download RAW message or body]
CVS commit by lunakl:
Backport crash on exit fix.
M +3 -12 KMixApp.cpp 1.8.2.1
M +0 -4 KMixApp.h 1.3.2.1
M +2 -2 kmix.cpp 1.197.2.1
--- kdemultimedia/kmix/KMixApp.cpp #1.8:1.8.2.1
@@ -29,7 +29,6 @@
KMixApp::KMixApp()
- : KUniqueApplication(), m_kmix( 0 ), _lastWindowClosed( false )
+ : KUniqueApplication(), m_kmix( 0 )
{
- connect( this, SIGNAL(lastWindowClosed()), this, SLOT(rememberLastWindowClosed()) );
}
@@ -37,8 +36,5 @@ KMixApp::KMixApp()
KMixApp::~KMixApp()
{
- if ( !_lastWindowClosed) {
- _lastWindowClosed = true;
delete m_kmix;
- }
}
@@ -75,8 +71,3 @@ KMixApp::quitExtended()
}
-void KMixApp::rememberLastWindowClosed() {
- // remember that, so that we don't delete the MainWindow again in the destructor
- _lastWindowClosed = true;
-}
-
#include "KMixApp.moc"
--- kdemultimedia/kmix/KMixApp.h #1.3:1.3.2.1
@@ -20,10 +20,6 @@ Q_OBJECT
void stopUpdatesOnVisibility();
- private slots:
- void rememberLastWindowClosed();
-
private:
KMixWindow *m_kmix;
- bool _lastWindowClosed;
};
--- kdemultimedia/kmix/kmix.cpp #1.197:1.197.2.1
@@ -62,5 +62,5 @@
*/
KMixWindow::KMixWindow()
- : KMainWindow(0, 0, 0 ), m_showTicks( true ),
+ : KMainWindow(0, 0, 0, 0), m_showTicks( true ),
m_lockedLayout(0),
m_dockWidget( 0L )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic