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

Move update_1_2_0() functionality into upgrade_1_1_90();

Browse Source 
Next release candidate will be named 1.1.90
This commit is contained in:
Colin Wallace
2015-09-05 21:38:36 -07:00
parent f6b696fa0f
commit 39133ab0ea
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/ConfigManager.h
View File

@@ -258,7 +258,6 @@ private:
~ConfigManager();
void upgrade_1_1_90();
void upgrade_1_2_0();
void upgrade();
const QString m_lmmsRcFile;

9
src/core/ConfigManager.cpp
View File

@@ -111,10 +111,7 @@ void ConfigManager::upgrade_1_1_90()
{
setValue("mixer", "audiodev", "PulseAudio");
}
}
void ConfigManager::upgrade_1_2_0()
{
// MidiAlsaRaw used to store the device info as "Device" instead of "device"
if ( value( "MidiAlsaRaw", "device" ).isNull() )
{
@@ -130,6 +127,7 @@ void ConfigManager::upgrade_1_2_0()
}
}
void ConfigManager::upgrade()
{
// Skip the upgrade if versions match
@@ -144,11 +142,6 @@ void ConfigManager::upgrade()
{
upgrade_1_1_90();
}
if ( createdWith.setCompareType(Build) < "1.2.0" )
{
upgrade_1_2_0();
}
// Don't use old themes as they break the UI (i.e. 0.4 != 1.0, etc)
if ( createdWith.setCompareType(Minor) != LMMS_VERSION )