From 0eb55d120ccd80a3008b05d2103e7c807cc88cbd Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Fri, 20 Jun 2008 23:34:22 +0000
Subject: [PATCH] fixed crash when closing meterDialog and choosing custom-sync
 afterwards

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1160 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 include/tempo_sync_knob.h           |  3 ++-
 src/gui/widgets/tempo_sync_knob.cpp | 23 ++++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/include/tempo_sync_knob.h b/include/tempo_sync_knob.h
index d02f6975f..8f4a6dc2e 100644
--- a/include/tempo_sync_knob.h
+++ b/include/tempo_sync_knob.h
@@ -27,6 +27,7 @@
 #define _TEMPO_SYNC_KNOB_H
 
 #include <QtGui/QPixmap>
+#include <QtCore/QPointer>
 
 #include "knob.h"
 #include "meter_model.h"
@@ -146,7 +147,7 @@ private:
 	QPixmap m_tempoSyncIcon;
 	QString m_tempoSyncDescription;
 
-	meterDialog * m_custom;
+	QPointer<meterDialog> m_custom;
 
 } ;
 
diff --git a/src/gui/widgets/tempo_sync_knob.cpp b/src/gui/widgets/tempo_sync_knob.cpp
index dd6a78f18..d9da4fb97 100644
--- a/src/gui/widgets/tempo_sync_knob.cpp
+++ b/src/gui/widgets/tempo_sync_knob.cpp
@@ -210,12 +210,9 @@ tempoSyncKnob::tempoSyncKnob( int _knob_num, QWidget * _parent,
 						const QString & _name ) :
 	knob( _knob_num, _parent, _name ),
 	m_tempoSyncIcon( embed::getIconPixmap( "tempo_sync" ) ),
-	m_tempoSyncDescription( tr( "Tempo Sync" ) )
+	m_tempoSyncDescription( tr( "Tempo Sync" ) ),
+	m_custom( NULL )
 {
-	m_custom = new meterDialog( engine::getMainWindow()->workspace() );
-	engine::getMainWindow()->workspace()->addSubWindow( m_custom );
-	m_custom->parentWidget()->hide();
-	m_custom->setWindowTitle( "Meter" );
 }
 
 
@@ -238,7 +235,10 @@ void tempoSyncKnob::modelChanged( void )
 	{
 		printf( "no tempoSyncKnobModel has been set!\n" );
 	}
-	m_custom->setModel( &model()->m_custom );
+	if( m_custom != NULL )
+	{
+		m_custom->setModel( &model()->m_custom );
+	}
 	connect( model(), SIGNAL( syncModeChanged( tempoSyncMode ) ),
 			this, SLOT( updateDescAndIcon() ) );
 	connect( this, SIGNAL( sliderMoved( float ) ),
@@ -377,7 +377,8 @@ void tempoSyncKnob::updateDescAndIcon( void )
 	{
 		m_tempoSyncDescription = tr( "Tempo Sync" );
 	}
-	if( model()->m_tempoSyncMode != tempoSyncKnobModel::SyncCustom )
+	if( m_custom != NULL &&
+		model()->m_tempoSyncMode != tempoSyncKnobModel::SyncCustom )
 	{
 		m_custom->parentWidget()->hide();
 	}
@@ -469,6 +470,14 @@ void tempoSyncKnob::setSyncIcon( const QPixmap & _new_icon )
 
 void tempoSyncKnob::showCustom( void )
 {
+	if( m_custom == NULL )
+	{
+	 	m_custom = new meterDialog(
+					engine::getMainWindow()->workspace() );
+		engine::getMainWindow()->workspace()->addSubWindow( m_custom );
+		m_custom->setWindowTitle( "Meter" );
+		m_custom->setModel( &model()->m_custom );
+	}
 	m_custom->parentWidget()->show();
 	model()->setTempoSync( tempoSyncKnobModel::SyncCustom );
 }