#572: Check with and without /pfx for Heroic Wine prefixes

Author: mtkennerly

src/scan.rs

@@ -529,13 +529,17 @@ pub fn scan_game_for_backup(
     }
     for root in roots {
         for wp in launchers.get_game(root, name).filter_map(|x| x.prefix.as_ref()) {
-            let with_pfx = wp.joined("pfx");
-            scan_game_for_backup_add_prefix(
-                &mut roots_to_check,
-                &mut paths_to_check,
-                if with_pfx.exists() { &with_pfx } else { wp },
-                !game.registry.is_empty(),
-            );
+            scan_game_for_backup_add_prefix(&mut roots_to_check, &mut paths_to_check, wp, !game.registry.is_empty());
+
+            let pfx = wp.joined("pfx");
+            if pfx.exists() {
+                scan_game_for_backup_add_prefix(
+                    &mut roots_to_check,
+                    &mut paths_to_check,
+                    &pfx,
+                    !game.registry.is_empty(),
+                );
+            }
         }
     }
 

src/scan/launchers/heroic.rs

@@ -130,14 +130,16 @@ fn find_prefix(
                     }
 
                     "proton" => {
-                        let prefix = format!("{wine_prefix}/pfx");
+                        // This would usually be `{wine_prefix}/pfx`,
+                        // but in at least one case in a Flatpak install,
+                        // that was a broken link and the real prefix was just `wine_prefix`.
                         log::trace!(
                             "Found Heroic Proton prefix for {} ({}), adding {}",
                             game_name,
                             app_name,
-                            &prefix
+                            wine_prefix
                         );
-                        Some(StrictPath::new(prefix))
+                        Some(StrictPath::new(wine_prefix.clone()))
                     }
 
                     _ => {