mirror of
https://github.com/dborth/vbagx.git
synced 2025-02-16 18:59:12 +01:00
Merge pull request #346 from askotx/master
-Restore: don't reset settings when going back to an older version
This commit is contained in:
commit
221a547c3e
@ -3179,7 +3179,7 @@ static int MenuSettingsEmulation()
|
|||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
GCSettings.GBHardware++;
|
GCSettings.GBHardware++;
|
||||||
if (GCSettings.GBHardware > 3)
|
if (GCSettings.GBHardware > 5)
|
||||||
GCSettings.GBHardware = 0;
|
GCSettings.GBHardware = 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -469,9 +469,6 @@ decodePrefsData ()
|
|||||||
result = false;
|
result = false;
|
||||||
else if(verMajor < 2) // less than version 2.0.0
|
else if(verMajor < 2) // less than version 2.0.0
|
||||||
result = false; // reset settings (sorry, should update settings instead)
|
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
|
else
|
||||||
result = true;
|
result = true;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user