Fix issue with saving cheats

mupen64plus-ae · Oct 10, 2015 · bdf15f2 · bdf15f2
1 parent 565f4c0
commit bdf15f2
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/paulscode/android/mupen64plusae/cheat/CheatEditorActivity.java b/src/paulscode/android/mupen64plusae/cheat/CheatEditorActivity.java
@@ -21,6 +21,7 @@
 package paulscode.android.mupen64plusae.cheat;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
@@ -153,15 +154,20 @@ public void onExtractFinished(ArrayList<Cheat> moreCheats)
     {
         systemCheats.clear();
         systemCheats.addAll( moreCheats );
-        systemCheats.addAll(userCheats);
     }    
 
     private void save( String crc )
     {
+        ArrayList<Cheat> combinedCheats;
+        combinedCheats = new ArrayList<Cheat>();
+        combinedCheats.addAll(systemCheats);
+        combinedCheats.addAll(userCheats);
+        Collections.sort(combinedCheats);
+
         CheatFile usrcheat_txt = new CheatFile( mGlobalPrefs.customCheats_txt, true );
         CheatFile mupencheat_txt = new CheatFile( mAppData.mupencheat_txt, true );
         CheatUtils.save( crc, usrcheat_txt, userCheats, mRomHeaderName, mRomCountryCode, this, false );
-        CheatUtils.save( crc, mupencheat_txt, systemCheats, mRomHeaderName, mRomCountryCode, this, true );
+        CheatUtils.save( crc, mupencheat_txt, combinedCheats, mRomHeaderName, mRomCountryCode, this, true );
     }
 
     private boolean isHexNumber( String num )