6814f7e5f8
Papers crashes when previously removed "bookmarks" sidebar is set as default in "sidebar-page" key. Checking whether the value of "sidebar-page" is among expected values avoids the crash. Related: RHEL-74354
99 lines
3.1 KiB
Diff
99 lines
3.1 KiB
Diff
From 4de71d6b8276fb82c8ccbe1ed5ed8ca69bf2d612 Mon Sep 17 00:00:00 2001
|
|
From: Marek Kasik <mkasik@redhat.com>
|
|
Date: Tue, 28 Jan 2025 15:58:19 +0100
|
|
Subject: [PATCH] shell: Check value of "sidebar-page" key
|
|
|
|
Papers crashes when previously removed "bookmarks" sidebar is set as default
|
|
in "sidebar-page" key.
|
|
Checking whether the value of "sidebar-page" is among expected values avoids
|
|
the crash.
|
|
---
|
|
shell/src/sidebar.rs | 56 +++++++++++++++++++++++++++-----------------
|
|
1 file changed, 34 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/shell/src/sidebar.rs b/shell/src/sidebar.rs
|
|
index 476548835..394278a9a 100644
|
|
--- a/shell/src/sidebar.rs
|
|
+++ b/shell/src/sidebar.rs
|
|
@@ -114,25 +114,46 @@ mod imp {
|
|
self.stack.visible_child_name().map(|gs| gs.to_string())
|
|
}
|
|
|
|
+ fn set_visible_child_default(&self) {
|
|
+ let Some(document) = self.document() else {
|
|
+ return;
|
|
+ };
|
|
+ if self
|
|
+ .stack
|
|
+ .child_by_name("links")
|
|
+ .unwrap()
|
|
+ .dynamic_cast_ref::<PpsSidebarPage>()
|
|
+ .unwrap()
|
|
+ .support_document(&document)
|
|
+ {
|
|
+ self.stack.set_visible_child_name("links");
|
|
+ } else {
|
|
+ self.stack.set_visible_child_name("thumbnails");
|
|
+ }
|
|
+ }
|
|
+
|
|
fn set_visible_child_name(&self, name: Option<String>) {
|
|
let Some(document) = self.document() else {
|
|
return;
|
|
};
|
|
let Some(name) = name else {
|
|
- if self
|
|
- .stack
|
|
- .child_by_name("links")
|
|
- .unwrap()
|
|
- .dynamic_cast_ref::<PpsSidebarPage>()
|
|
- .unwrap()
|
|
- .support_document(&document)
|
|
- {
|
|
- self.stack.set_visible_child_name("links");
|
|
- } else {
|
|
- self.stack.set_visible_child_name("thumbnails");
|
|
- }
|
|
+ self.set_visible_child_default();
|
|
return;
|
|
};
|
|
+
|
|
+ if ![
|
|
+ "annotations",
|
|
+ "attachments",
|
|
+ "layers",
|
|
+ "links",
|
|
+ "thumbnails",
|
|
+ ]
|
|
+ .contains(&name.as_str())
|
|
+ {
|
|
+ self.set_visible_child_default();
|
|
+ return;
|
|
+ }
|
|
+
|
|
let page = self.stack.child_by_name(&name).unwrap();
|
|
|
|
if page
|
|
@@ -141,17 +162,8 @@ mod imp {
|
|
.support_document(&document)
|
|
{
|
|
self.stack.set_visible_child(&page);
|
|
- } else if self
|
|
- .stack
|
|
- .child_by_name("links")
|
|
- .unwrap()
|
|
- .dynamic_cast_ref::<PpsSidebarPage>()
|
|
- .unwrap()
|
|
- .support_document(&document)
|
|
- {
|
|
- self.stack.set_visible_child_name("links");
|
|
} else {
|
|
- self.stack.set_visible_child_name("thumbnails");
|
|
+ self.set_visible_child_default();
|
|
}
|
|
}
|
|
}
|
|
--
|
|
2.48.1
|
|
|