hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'stable-1.2'

Browse Source 
# Conflicts:
#	cmake/linux/package_linux.sh.in
#	data/locale/cs.ts
This commit is contained in:
Hyunjin Song
2018-08-24 09:50:36 +09:00
parent 8d00e90322 b5dc70c20a
commit 12d251cc3e
18 changed files with 62 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/ControllerConnection.cpp
View File

@@ -204,16 +204,22 @@ void ControllerConnection::loadSettings( const QDomElement & _this )
}
else
{
if( _this.attribute( "id", "-1" ).toInt() >= 0 )
{
m_controllerId = _this.attribute( "id" ).toInt();
}
else
m_controllerId = _this.attribute( "id", "-1" ).toInt();
if( m_controllerId < 0 )
{
qWarning( "controller index invalid\n" );
m_controllerId = -1;
}
m_controller = Controller::create( Controller::DummyController, NULL );
if (!Engine::getSong()->isLoadingProject() && m_controllerId != -1)
{
setController( Engine::getSong()->
controllers().at( m_controllerId ) );
}
else
{
m_controller = Controller::create( Controller::DummyController, NULL );
}
}
}

2
src/gui/SetupDialog.cpp
View File

@@ -187,7 +187,7 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
SLOT( setBufferSize( int ) ) );
m_bufSizeLbl = new QLabel( bufsize_tw );
m_bufSizeLbl->setGeometry( 10, 40, 200, 24 );
m_bufSizeLbl->setGeometry( 10, 40, 200, 32 );
setBufferSize( m_bufSizeSlider->value() );
QPushButton * bufsize_reset_btn = new QPushButton(