fix: improve profile combo box filter logic

Don't show other profiles too if the selected one is experimental. Only show the selected one.
SeaDve · Feb 13, 2024 · ec68969 · ec68969
1 parent f462ca5
commit ec68969
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/preferences_dialog.rs b/src/preferences_dialog.rs
@@ -96,13 +96,14 @@ mod imp {
             }
             profiles_model.splice(profiles_model.n_items(), 0, profiles);
 
-            let is_using_experimental =
-                *IS_EXPERIMENTAL_MODE || active_profile.is_some_and(|p| p.is_experimental());
             let filter = gtk::BoolFilter::new(Some(&gtk::ClosureExpression::new::<bool>(
                 &[] as &[&gtk::Expression],
                 closure!(|obj: glib::Object| {
                     profile_from_obj(&obj).map_or(true, |profile| {
-                        (!profile.is_experimental() || is_using_experimental)
+                        (*IS_EXPERIMENTAL_MODE
+                            || !profile.is_experimental()
+                            || active_profile
+                                .is_some_and(|active_profile| active_profile == profile))
                             && profile.is_available()
                     })
                 }),

diff --git a/src/settings.rs b/src/settings.rs
@@ -106,7 +106,7 @@ impl Settings {
             .unwrap();
     }
 
-    pub fn profile(&self) -> Option<&Profile> {
+    pub fn profile(&self) -> Option<&'static Profile> {
         let profile_id = self.0.get::<String>("profile-id");
 
         if profile_id.is_empty() {