Merge branch 'stable-1.2'

sdasda7777 · Apr 7, 2017 · 97f3eb5 · 97f3eb5
2 parents 338c2ea + a07d3f7
commit 97f3eb5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp
@@ -152,7 +152,7 @@ SampleBuffer::~SampleBuffer()
 
 void SampleBuffer::sampleRateChanged()
 {
-	update();
+	update( true );
 }
 
 

diff --git a/src/gui/widgets/TrackLabelButton.cpp b/src/gui/widgets/TrackLabelButton.cpp
@@ -48,20 +48,21 @@ TrackLabelButton::TrackLabelButton( TrackView * _tv, QWidget * _parent ) :
 	setAcceptDrops( true );
 	setCursor( QCursor( embed::getIconPixmap( "hand" ), 3, 3 ) );
 	setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
-
+	m_renameLineEdit = new QLineEdit( this );
+	m_renameLineEdit->hide();
+
 	if( ConfigManager::inst()->value( "ui", "compacttrackbuttons" ).toInt() )
 	{
 		setFixedSize( 32, 29 );
 	}
 	else
 	{
 		setFixedSize( 160, 29 );
-		m_renameLineEdit = new QLineEdit( this );
 		m_renameLineEdit->move( 30, ( height() / 2 ) - ( m_renameLineEdit->sizeHint().height() / 2 ) );
 		m_renameLineEdit->setFixedWidth( width() - 33 );
-		m_renameLineEdit->hide();
 		connect( m_renameLineEdit, SIGNAL( editingFinished() ), this, SLOT( renameFinished() ) );
 	}
+
 	setIconSize( QSize( 24, 24 ) );
 	connect( m_trackView->getTrack(), SIGNAL( dataChanged() ), this, SLOT( update() ) );
 	connect( m_trackView->getTrack(), SIGNAL( nameChanged() ), this, SLOT( nameChanged() ) );
-Original file line number
+Diff line change
@@ Expand Up / @@ -152,7 +152,7 @@ SampleBuffer::~SampleBuffer() @@
     void SampleBuffer::sampleRateChanged()
     {
-    	update();
+    	update( true );
     }
@@ Expand Down @@