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

Merge pull request #1513 from DanWin/cmd

Browse Source 
Make command line project export working again
This commit is contained in:
Tres Finocchiaro
2014-12-28 22:08:37 -05:00
parent 23ec0e71c1 011dee2564
commit f03702d4f4
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/AutomationPattern.cpp
View File

@@ -867,7 +867,7 @@ void AutomationPattern::generateTangents()
void AutomationPattern::generateTangents( timeMap::const_iterator it,
int numToGenerate )
{
if( m_timeMap.size() < 2 )
if( m_timeMap.size() < 2 && numToGenerate > 0 )
{
m_tangents[it.key()] = 0;
return;

4
src/core/EnvelopeAndLfoParameters.cpp
View File

@@ -446,14 +446,14 @@ void EnvelopeAndLfoParameters::updateSampleVars()
{
sample_t * tmp = m_pahdEnv;
m_pahdEnv = new sample_t[m_pahdFrames];
delete tmp;
delete[] tmp;
m_pahdBufSize = m_pahdFrames;
}
if( m_rBufSize < m_rFrames )
{
sample_t * tmp = m_rEnv;
m_rEnv = new sample_t[m_rFrames];
delete tmp;
delete[] tmp;
m_rBufSize = m_rFrames;
}

10
src/core/Song.cpp
View File

@@ -911,7 +911,10 @@ void Song::loadProject( const QString & _file_name )
m_loadingProject = true;
Engine::projectJournal()->setJournalling( false );
Engine::mainWindow()->clearErrors();
if( Engine::mainWindow() )
{
Engine::mainWindow()->clearErrors();
}
m_fileName = _file_name;
m_oldFileName = _file_name;
@@ -1023,7 +1026,10 @@ void Song::loadProject( const QString & _file_name )
emit projectLoaded();
Engine::mainWindow()->showErrors( tr( "The following errors occured while loading: " ) );
if( Engine::mainWindow() )
{
Engine::mainWindow()->showErrors( tr( "The following errors occured while loading: " ) );
}
m_loadingProject = false;
m_modified = false;