Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/restoreFiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default async function restoreFiles(files) {

await Promise.all(
files.map(async (file, i) => {
rendered = file.render;
rendered ||= !!file.render;

if (i === files.length - 1 && !rendered) {
file.render = true;
Expand Down
13 changes: 9 additions & 4 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -606,15 +606,17 @@ async function loadApp() {
if (Array.isArray(files) && files.length) {
try {
await restoreFiles(files);
// save state to handle file loading gracefully
sessionStorage.setItem("isfilesRestored", true);
// Process any pending intents that were queued before files were restored
await processPendingIntents();
} catch (error) {
window.log("error", "File loading failed!");
window.log("error", error);
toast("File loading failed!");
} finally {
// Mark restoration complete even after a partial failure so
// switch-file persistence and queued intents are not blocked.
sessionStorage.setItem("isfilesRestored", true);
}
// Process any pending intents that were queued before files were restored
await processPendingIntents();
} else {
// Even when no files need to be restored, mark as restored and process pending intents
sessionStorage.setItem("isfilesRestored", true);
Expand Down Expand Up @@ -661,6 +663,9 @@ async function loadApp() {
if (settings.value.rememberFiles && activeFile) {
localStorage.setItem("lastfile", activeFile.id);
}
if (saveState && sessionStorage.getItem("isfilesRestored") === "true") {
acode.exec("save-state");
}
return;
}

Expand Down