Merge pull request #346 from askotx/master

-Restore: don't reset settings when going back to an older version
This commit is contained in:
askotx 2016-12-11 22:24:47 -07:00 committed by GitHub
commit 221a547c3e
2 changed files with 1 additions and 4 deletions

View File

@ -3179,7 +3179,7 @@ static int MenuSettingsEmulation()
{
case 0:
GCSettings.GBHardware++;
if (GCSettings.GBHardware > 3)
if (GCSettings.GBHardware > 5)
GCSettings.GBHardware = 0;
break;

View File

@ -469,9 +469,6 @@ decodePrefsData ()
result = false;
else if(verMajor < 2) // less than version 2.0.0
result = false; // reset settings (sorry, should update settings instead)
else if((verMajor*100 + verMinor*10 + verPoint) >
(curMajor*100 + curMinor*10 + curPoint)) // some future version
result = false; // reset settings
else
result = true;
}