BookPage is properly destroyed when book is closed and not kept behind

TronFortyTwo · Mar 4, 2021 · 025ddf1 · 025ddf1
1 parent 3f11b1e
commit 025ddf1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/po/sturmreader.pot b/po/sturmreader.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sturmreader.emanuelesorce\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2021-03-04 12:02+0000\n"
+"POT-Creation-Date: 2021-03-04 12:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

diff --git a/ui/qml/BookPage.qml b/ui/qml/BookPage.qml
@@ -266,12 +266,9 @@ Page {
 					Action {
 						icon.name: "go-home"
 						onTriggered: {
-							// turn stuff off and exit
 							content.close();
 							controls.close();
-							controls.interactive = false;
-							pageStack.pop()
-							mainView.title = mainView.defaultTitle
+							closeFile();
 						}
 					}
 				]

diff --git a/ui/qml/Main.qml b/ui/qml/Main.qml
@@ -158,7 +158,15 @@ ApplicationWindow {
 		converter.converted_filename = dir + "/" + newfilename;
 	}
 
+	// close file
+	function closeFile() {
+		while (pageStack.currentItem != localBooks)
+			pageStack.pop()
+		bookPage.destroy();
+		mainView.title = mainView.defaultTitle;
+	}
 
+	// Open file
     function loadFile(filename) {
         if (server.reader.load(filename)) {
             while (pageStack.currentItem != localBooks)