fix: prevent executing insert command when loading empty books (#40)

chrrs · Jan 26, 2025 · ce2a8ee · ce2a8ee
1 parent 670dc90
commit ce2a8ee
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/main/java/me/chrr/scribble/mixin/BookEditScreenMixin.java b/src/main/java/me/chrr/scribble/mixin/BookEditScreenMixin.java
@@ -456,20 +456,15 @@ private void saveTo(Path path) {
     private void loadFrom(Path path) {
         try {
             BookFile bookFile = BookFile.read(path);
+            Collection<RichText> loadedPages = bookFile.pages().isEmpty()
+                    ? List.of(RichText.empty()) // if loaded book has no pages, then create an empty page
+                    : bookFile.pages();
 
-            this.richPages.clear();
-            this.pages.clear();
+            richPages.clear();
+            pages.clear();
             commandManager.clear();
 
-            // Loading an empty book file would set the total amount of pages to 0.
-            // We work around this by just inserting a new empty page.
-            if (bookFile.pages().isEmpty()) {
-                this.currentPage = 0;
-                this.insertPage();
-                return;
-            }
-
-            for (RichText page : bookFile.pages()) {
+            for (RichText page : loadedPages) {
                 this.richPages.add(page);
                 this.pages.add(page.getAsFormattedString());
             }