Merge 1889832d12ebbd4447a4b0fbab0add3ec33644d0 into 26ce7e4f2844a445bf77b4b14977d62e6434df08

This commit is contained in:
Kleidis 2025-03-12 11:52:05 +07:00 committed by GitHub
commit 43e6b0fe60
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -533,7 +533,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
val slot = i val slot = i
var enableClick = isSaving var enableClick = isSaving
val text = if (slot == NativeLibrary.QUICKSAVE_SLOT) { val text = if (slot == NativeLibrary.QUICKSAVE_SLOT) {
enableClick = false
getString(R.string.emulation_quicksave_slot) getString(R.string.emulation_quicksave_slot)
} else { } else {
getString(R.string.emulation_empty_state_slot, slot) getString(R.string.emulation_empty_state_slot, slot)
@ -542,6 +541,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
add(text).setEnabled(enableClick).setOnMenuItemClickListener { add(text).setEnabled(enableClick).setOnMenuItemClickListener {
if(isSaving) { if(isSaving) {
NativeLibrary.saveState(slot) NativeLibrary.saveState(slot)
Toast.makeText(context,
getString(R.string.quicksave_saving),
Toast.LENGTH_SHORT).show()
} else { } else {
NativeLibrary.loadState(slot) NativeLibrary.loadState(slot)
binding.drawerLayout.close() binding.drawerLayout.close()
@ -557,8 +559,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
savestates?.forEach { savestates?.forEach {
var enableClick = true var enableClick = true
val text = if(it.slot == NativeLibrary.QUICKSAVE_SLOT) { val text = if(it.slot == NativeLibrary.QUICKSAVE_SLOT) {
// do not allow saving in quicksave slot
enableClick = !isSaving
getString(R.string.emulation_occupied_quicksave_slot, it.time) getString(R.string.emulation_occupied_quicksave_slot, it.time)
} else{ } else{
getString(R.string.emulation_occupied_state_slot, it.slot, it.time) getString(R.string.emulation_occupied_state_slot, it.slot, it.time)