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

Fix "disable autoquit" option

Browse Source 
Wasn't getting saved/loaded properly, fixed that
TODO: disable autoquit causes some effects to keep running even when the song is stopped... this should be addressed at some point
This commit is contained in:
Vesa
2014-07-27 01:10:34 +03:00
parent 07a0f46c82
commit f2d88d1fc2
4 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/config_mgr.h
View File

@@ -163,16 +163,6 @@ public:
return( m_recentlyOpenedProjects );
}
const bool isAutoquitDisabled() const
{
return m_isAutoquitDisabled;
}
void setAutoquitDisabled( bool value )
{
m_isAutoquitDisabled = value;
}
void addRecentlyOpenedProject( const QString & _file );
const QString & value( const QString & _class,
@@ -219,8 +209,6 @@ private:
QString m_backgroundArtwork;
QStringList m_recentlyOpenedProjects;
bool m_isAutoquitDisabled;
typedef QVector<QPair<QString, QString> > stringPairVector;
typedef QMap<QString, stringPairVector> settingsMap;
settingsMap m_settings;

1
include/setup_dialog.h
View File

@@ -161,6 +161,7 @@ private:
bool m_animateAFP;
bool m_printNoteLabels;
bool m_displayWaveform;
bool m_disableAutoQuit;
typedef QMap<QString, AudioDevice::setupWidget *> AswMap;
typedef QMap<QString, MidiClient::setupWidget *> MswMap;

2
src/core/Effect.cpp
View File

@@ -133,7 +133,7 @@ Effect * Effect::instantiate( const QString& pluginName,
void Effect::checkGate( double _out_sum )
{
if( configManager::inst()->isAutoquitDisabled() )
if( configManager::inst()->value( "ui", "disableautoquit").toInt() )
{
return;
}

10
src/gui/setup_dialog.cpp
View File

@@ -121,7 +121,9 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
m_printNoteLabels(configManager::inst()->value( "ui",
"printnotelabels").toInt() ),
m_displayWaveform(configManager::inst()->value( "ui",
"displaywaveform").toInt() )
"displaywaveform").toInt() ),
m_disableAutoQuit(configManager::inst()->value( "ui",
"disableautoquit").toInt() )
{
setWindowIcon( embed::getIconPixmap( "setup_general" ) );
setWindowTitle( tr( "Setup LMMS" ) );
@@ -294,7 +296,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) :
misc_tw );
labelNumber++;
disableAutoquit->move( XDelta, YDelta*labelNumber );
disableAutoquit->setChecked( configManager::inst()->isAutoquitDisabled() );
disableAutoquit->setChecked( m_disableAutoQuit );
connect( disableAutoquit, SIGNAL( toggled( bool ) ),
this, SLOT( toggleDisableAutoquit( bool ) ) );
@@ -823,7 +825,7 @@ void setupDialog::accept()
configManager::inst()->setValue( "ui", "displaywaveform",
QString::number( m_displayWaveform ) );
configManager::inst()->setValue( "ui", "disableautoquit",
QString::number( configManager::inst()->isAutoquitDisabled() ) );
QString::number( m_disableAutoQuit ) );
configManager::inst()->setWorkingDir( m_workingDir );
@@ -1015,7 +1017,7 @@ void setupDialog::toggleDisplayWaveform( bool en )
void setupDialog::toggleDisableAutoquit( bool en )
{
configManager::inst()->setAutoquitDisabled( en );
m_disableAutoQuit = en;
}