Scratch and New now refresh the browser view

Using the keyboard to exit emulation no longer CD /
This commit is contained in:
penfold42 2018-07-19 18:28:56 +10:00
parent 23a2acf510
commit 9d10bcb3ef
2 changed files with 11 additions and 4 deletions

View File

@ -1107,6 +1107,8 @@ void IEC_Commands::New(void)
if (ret==0)
{
updateAction = REFRESH;
// Mount the new disk? Shoud we do this or let them do it manually?
if (f_stat(filenameNew, &filInfo) == FR_OK)
{
@ -1187,6 +1189,7 @@ void IEC_Commands::Scratch(void)
f_unlink(filInfo.fname);
}
res = f_findnext(&dir, &filInfo);
updateAction = REFRESH;
}
text = ParseNextName(text, filename, true);
}

View File

@ -697,8 +697,10 @@ void emulator()
fileBrowser->ClearSelections();
// Go back to the root folder so you can load fb* again?
if ((resetWhileEmulating && options.GetOnResetChangeToStartingFolder()) || selectedViaIECCommands) fileBrowser->DisplayRoot(); // Go back to the root folder and display it.
else fileBrowser->RefeshDisplay(); // Just redisplay the current folder.
// if ((resetWhileEmulating && options.GetOnResetChangeToStartingFolder()) || selectedViaIECCommands)
// fileBrowser->DisplayRoot(); // Go back to the root folder and display it.
// else
fileBrowser->RefeshDisplay(); // Just redisplay the current folder.
resetWhileEmulating = false;
selectedViaIECCommands = false;
@ -979,12 +981,14 @@ void emulator()
IEC_Bus::WaitUntilReset();
//DEBUG_LOG("6502 resetting\r\n");
if (options.GetOnResetChangeToStartingFolder() || selectedViaIECCommands)
fileBrowser->DisplayRoot();//m_IEC_Commands.ChangeToRoot(); // TO CHECK
emulating = false;
resetWhileEmulating = true;
if (reset)
{
exitReason = EXIT_RESET;
if (options.GetOnResetChangeToStartingFolder() || selectedViaIECCommands)
fileBrowser->DisplayRoot(); // TO CHECK
}
if (exitEmulation)
exitReason = EXIT_KEYBOARD;
break;