Cargo.lock

@@ -840,9 +840,9 @@ dependencies = [
 
 [[package]]
 name = "cwdemangle"
-version = "0.1.6"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c251bc5553377b3dc85c7b9b3955cfc2eb5a7b5544cf65adc2d53c2a4c2f4162"
+checksum = "b58d34a3a03cfe0a4ebfd03aeda6ee8a0f2e99bd3308476a8a89815add3ec373"
 dependencies = [
  "argh",
 ]
@@ -2457,7 +2457,7 @@ dependencies = [
 
 [[package]]
 name = "objdiff"
-version = "0.4.1"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "byteorder",
@@ -3044,9 +3044,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.101.4"
+version = "0.101.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
+checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e"
 dependencies = [
  "ring",
  "untrusted",
@@ -4051,9 +4051,9 @@ dependencies = [
 
 [[package]]
 name = "webpki"
-version = "0.22.1"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
 dependencies = [
  "ring",
  "untrusted",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "objdiff"
-version = "0.4.1"
+version = "0.4.0"
 edition = "2021"
 rust-version = "1.65"
 authors = ["Luke Street <luke@street.dev>"]
@@ -27,7 +27,7 @@ byteorder = "1.4.3"
 bytes = "1.4.0"
 cfg-if = "1.0.0"
 const_format = "0.2.31"
-cwdemangle = "0.1.6"
+cwdemangle = "0.1.5"
 dirs = "5.0.1"
 eframe = { version = "0.22.0", features = ["persistence"] }
 egui = "0.22.0"

README.md

@@ -50,11 +50,8 @@ file as well. You can then add `objdiff.json` to your `.gitignore` to prevent it
 // objdiff.json
 {
   "custom_make": "ninja",
-
-  // Only required if objects use "path" instead of "target_path" and "base_path".
   "target_dir": "build/asm",
   "base_dir": "build/src",
-
   "build_target": true,
   "watch_patterns": [
     "*.c",
@@ -66,15 +63,8 @@ file as well. You can then add `objdiff.json` to your `.gitignore` to prevent it
   ],
   "objects": [
     {
-      "name": "main/MetroTRK/mslsupp",
-
-      // Option 1: Relative to target_dir and base_dir
       "path": "MetroTRK/mslsupp.o",
-      // Option 2: Explicit paths from project root
+      "name": "MetroTRK/mslsupp",
-      // Useful for more complex directory layouts
-      "target_path": "build/asm/MetroTRK/mslsupp.o",
-      "base_path": "build/src/MetroTRK/mslsupp.o",
-      
       "reverse_fn_order": false
     },
     // ...
@@ -82,44 +72,26 @@ file as well. You can then add `objdiff.json` to your `.gitignore` to prevent it
 }
 ```
 
-`custom_make` _(optional)_: By default, objdiff will use `make` to build the project.  
+- `custom_make` _(optional)_: By default, objdiff will use `make` to build the project.  
   If the project uses a different build system (e.g. `ninja`), specify it here.
-
+- `target_dir`: Relative from the root of the project, this where the "target" or "expected" objects are located.  
-`target_dir` _(optional)_: Relative from the root of the project, this where the "target" or "expected" objects are located.  
   These are the **intended result** of the match.
-
+- `base_dir`: Relative from the root of the project, this is where the "base" or "actual" objects are located.  
-`base_dir` _(optional)_: Relative from the root of the project, this is where the "base" or "actual" objects are located.  
   These are objects built from the **current source code**.
-
+- `build_target`: If true, objdiff will tell the build system to build the target objects before diffing (e.g.
-`build_target`: If true, objdiff will tell the build system to build the target objects before diffing (e.g.
   `make path/to/target.o`).  
   This is useful if the target objects are not built by default or can change based on project configuration or edits
   to assembly files.  
   Requires the build system to be configured properly.
-
+- `watch_patterns` _(optional)_: A list of glob patterns to watch for changes.
-`watch_patterns` _(optional)_: A list of glob patterns to watch for changes.
   ([Supported syntax](https://docs.rs/globset/latest/globset/#syntax))  
   If any of these files change, objdiff will automatically rebuild the objects and re-compare them.
-If not specified, objdiff will use the default patterns listed above.
+- `objects` _(optional)_: If specified, objdiff will display a list of objects in the sidebar for easy navigation.
-
+    - `path`: Relative path to the object from the `target_dir` and `base_dir`.
-`objects` _(optional)_: If specified, objdiff will display a list of objects in the sidebar for easy navigation.
+    - `name` _(optional)_: The name of the object in the UI. If not specified, the object's `path` will be used.
-
+    - `reverse_fn_order` _(optional)_: Displays function symbols in reversed order.  
-> `name` _(optional)_: The name of the object in the UI. If not specified, the object's `path` will be used.
-> 
-> `path`: Relative path to the object from the `target_dir` and `base_dir`.  
-> Requires `target_dir` and `base_dir` to be specified.
-> 
-> `target_path`: Path to the target object from the project root.  
-> Required if `path` is not specified.
-> 
-> `base_path`: Path to the base object from the project root.  
-> Required if `path` is not specified.
-> 
-> `reverse_fn_order` _(optional)_: Displays function symbols in reversed order.  
       Used to support MWCC's `-inline deferred` option, which reverses the order of functions in the object file.
 
-
-
 ## License
 
 Licensed under either of

src/app.rs

@@ -40,18 +40,6 @@ pub struct ViewState {
     pub show_project_config: bool,
 }
 
-/// The configuration for a single object file.
-#[derive(Clone, Eq, PartialEq, serde::Deserialize, serde::Serialize)]
-pub struct ObjectConfig {
-    pub name: String,
-    pub target_path: PathBuf,
-    pub base_path: PathBuf,
-    pub reverse_fn_order: Option<bool>,
-}
-
-#[inline]
-fn bool_true() -> bool { true }
-
 #[derive(Default, Clone, serde::Deserialize, serde::Serialize)]
 pub struct AppConfig {
     pub custom_make: Option<String>,
@@ -59,10 +47,9 @@ pub struct AppConfig {
     pub project_dir: Option<PathBuf>,
     pub target_obj_dir: Option<PathBuf>,
     pub base_obj_dir: Option<PathBuf>,
-    pub selected_obj: Option<ObjectConfig>,
+    pub obj_path: Option<String>,
     pub build_target: bool,
-    #[serde(default = "bool_true")]
+    pub watcher_enabled: bool,
-    pub rebuild_on_changes: bool,
     pub auto_update_check: bool,
     pub watch_patterns: Vec<Glob>,
 
@@ -78,8 +65,6 @@ pub struct AppConfig {
     pub obj_change: bool,
     #[serde(skip)]
     pub queue_build: bool,
-    #[serde(skip)]
-    pub project_config_loaded: bool,
 }
 
 impl AppConfig {
@@ -87,7 +72,7 @@ impl AppConfig {
         self.project_dir = Some(path);
         self.target_obj_dir = None;
         self.base_obj_dir = None;
-        self.selected_obj = None;
+        self.obj_path = None;
         self.build_target = false;
         self.objects.clear();
         self.object_nodes.clear();
@@ -95,25 +80,24 @@ impl AppConfig {
         self.config_change = true;
         self.obj_change = true;
         self.queue_build = false;
-        self.project_config_loaded = false;
     }
 
     pub fn set_target_obj_dir(&mut self, path: PathBuf) {
         self.target_obj_dir = Some(path);
-        self.selected_obj = None;
+        self.obj_path = None;
         self.obj_change = true;
         self.queue_build = false;
     }
 
     pub fn set_base_obj_dir(&mut self, path: PathBuf) {
         self.base_obj_dir = Some(path);
-        self.selected_obj = None;
+        self.obj_path = None;
         self.obj_change = true;
         self.queue_build = false;
     }
 
-    pub fn set_selected_obj(&mut self, object: ObjectConfig) {
+    pub fn set_obj_path(&mut self, path: String) {
-        self.selected_obj = Some(object);
+        self.obj_path = Some(path);
         self.obj_change = true;
         self.queue_build = false;
     }
@@ -274,19 +258,19 @@ impl App {
 
         if config.obj_change {
             *diff_state = Default::default();
-            if config.selected_obj.is_some() {
+            if config.obj_path.is_some() {
                 config.queue_build = true;
             }
             config.obj_change = false;
         }
 
-        if self.modified.swap(false, Ordering::Relaxed) && config.rebuild_on_changes {
+        if self.modified.swap(false, Ordering::Relaxed) {
             config.queue_build = true;
         }
 
         // Don't clear `queue_build` if a build is running. A file may have been modified during
         // the build, so we'll start another build after the current one finishes.
-        if config.queue_build && config.selected_obj.is_some() && !jobs.is_running(Job::ObjDiff) {
+        if config.queue_build && config.obj_path.is_some() && !jobs.is_running(Job::ObjDiff) {
             jobs.push(start_build(self.config.clone()));
             config.queue_build = false;
         }

src/config.rs

@@ -6,7 +6,7 @@ use std::{
 use anyhow::{Context, Result};
 use globset::{Glob, GlobSet, GlobSetBuilder};
 
-use crate::{app::AppConfig, views::config::DEFAULT_WATCH_PATTERNS};
+use crate::app::AppConfig;
 
 #[derive(Default, Clone, serde::Deserialize)]
 #[serde(default)]
@@ -15,7 +15,7 @@ pub struct ProjectConfig {
     pub target_dir: Option<PathBuf>,
     pub base_dir: Option<PathBuf>,
     pub build_target: bool,
-    pub watch_patterns: Option<Vec<Glob>>,
+    pub watch_patterns: Vec<Glob>,
     #[serde(alias = "units")]
     pub objects: Vec<ProjectObject>,
 }
@@ -23,24 +23,10 @@ pub struct ProjectConfig {
 #[derive(Default, Clone, serde::Deserialize)]
 pub struct ProjectObject {
     pub name: Option<String>,
-    pub path: Option<PathBuf>,
+    pub path: PathBuf,
-    pub target_path: Option<PathBuf>,
-    pub base_path: Option<PathBuf>,
     pub reverse_fn_order: Option<bool>,
 }
 
-impl ProjectObject {
-    pub fn name(&self) -> &str {
-        if let Some(name) = &self.name {
-            name
-        } else if let Some(path) = &self.path {
-            path.to_str().unwrap_or("[invalid path]")
-        } else {
-            "[unknown]"
-        }
-    }
-}
-
 #[derive(Clone)]
 pub enum ProjectObjectNode {
     File(String, ProjectObject),
@@ -67,22 +53,11 @@ fn find_dir<'a>(
     unreachable!();
 }
 
-fn build_nodes(
+fn build_nodes(objects: &[ProjectObject]) -> Vec<ProjectObjectNode> {
-    objects: &[ProjectObject],
-    project_dir: &Path,
-    target_obj_dir: &Option<PathBuf>,
-    base_obj_dir: &Option<PathBuf>,
-) -> Vec<ProjectObjectNode> {
     let mut nodes = vec![];
     for object in objects {
         let mut out_nodes = &mut nodes;
-        let path = if let Some(name) = &object.name {
+        let path = object.name.as_ref().map(Path::new).unwrap_or(&object.path);
-            Path::new(name)
-        } else if let Some(path) = &object.path {
-            path
-        } else {
-            continue;
-        };
         if let Some(parent) = path.parent() {
             for component in parent.components() {
                 if let Component::Normal(name) = component {
@@ -91,23 +66,8 @@ fn build_nodes(
                 }
             }
         }
-        let mut object = object.clone();
-        if let (Some(target_obj_dir), Some(path), None) =
-            (target_obj_dir, &object.path, &object.target_path)
-        {
-            object.target_path = Some(target_obj_dir.join(path));
-        } else if let Some(path) = &object.target_path {
-            object.target_path = Some(project_dir.join(path));
-        }
-        if let (Some(base_obj_dir), Some(path), None) =
-            (base_obj_dir, &object.path, &object.base_path)
-        {
-            object.base_path = Some(base_obj_dir.join(path));
-        } else if let Some(path) = &object.base_path {
-            object.base_path = Some(project_dir.join(path));
-        }
         let filename = path.file_name().unwrap().to_str().unwrap().to_string();
-        out_nodes.push(ProjectObjectNode::File(filename, object));
+        out_nodes.push(ProjectObjectNode::File(filename, object.clone()));
     }
     nodes
 }
@@ -124,14 +84,10 @@ pub fn load_project_config(config: &mut AppConfig) -> Result<()> {
         config.target_obj_dir = project_config.target_dir.map(|p| project_dir.join(p));
         config.base_obj_dir = project_config.base_dir.map(|p| project_dir.join(p));
         config.build_target = project_config.build_target;
-        config.watch_patterns = project_config.watch_patterns.unwrap_or_else(|| {
+        config.watch_patterns = project_config.watch_patterns;
-            DEFAULT_WATCH_PATTERNS.iter().map(|s| Glob::new(s).unwrap()).collect()
-        });
         config.watcher_change = true;
         config.objects = project_config.objects;
-        config.object_nodes =
+        config.object_nodes = build_nodes(&config.objects);
-            build_nodes(&config.objects, project_dir, &config.target_obj_dir, &config.base_obj_dir);
-        config.project_config_loaded = true;
     }
     Ok(())
 }

src/jobs/objdiff.rs

@@ -1,6 +1,6 @@
 use std::{path::Path, process::Command, str::from_utf8, sync::mpsc::Receiver};
 
-use anyhow::{anyhow, Context, Error, Result};
+use anyhow::{Context, Error, Result};
 use time::OffsetDateTime;
 
 use crate::{
@@ -76,51 +76,47 @@ fn run_build(
     config: AppConfigRef,
 ) -> Result<Box<ObjDiffResult>> {
     let config = config.read().map_err(|_| Error::msg("Failed to lock app config"))?.clone();
-    let obj_config = config.selected_obj.as_ref().ok_or_else(|| Error::msg("Missing obj path"))?;
+    let obj_path = config.obj_path.as_ref().ok_or_else(|| Error::msg("Missing obj path"))?;
     let project_dir =
         config.project_dir.as_ref().ok_or_else(|| Error::msg("Missing project dir"))?;
-    let target_path_rel = obj_config.target_path.strip_prefix(project_dir).map_err(|_| {
+    let mut target_path = config
-        anyhow!(
+        .target_obj_dir
-            "Target path '{}' doesn't begin with '{}'",
+        .as_ref()
-            obj_config.target_path.display(),
+        .ok_or_else(|| Error::msg("Missing target obj dir"))?
-            project_dir.display()
+        .to_owned();
-        )
+    target_path.push(obj_path);
-    })?;
+    let mut base_path =
-    let base_path_rel = obj_config.base_path.strip_prefix(project_dir).map_err(|_| {
+        config.base_obj_dir.as_ref().ok_or_else(|| Error::msg("Missing base obj dir"))?.to_owned();
-        anyhow!(
+    base_path.push(obj_path);
-            "Base path '{}' doesn't begin with '{}'",
+    let target_path_rel = target_path
-            obj_config.base_path.display(),
+        .strip_prefix(project_dir)
-            project_dir.display()
+        .context("Failed to create relative target obj path")?;
-        )
+    let base_path_rel =
-    })?;
+        base_path.strip_prefix(project_dir).context("Failed to create relative base obj path")?;
 
     let total = if config.build_target { 5 } else { 4 };
     let first_status = if config.build_target {
-        update_status(status, format!("Building target {}", target_path_rel.display()), 0, total, &cancel)?;
+        update_status(status, format!("Building target {obj_path}"), 0, total, &cancel)?;
         run_make(project_dir, target_path_rel, &config)
     } else {
         BuildStatus { success: true, log: String::new() }
     };
 
-    update_status(status, format!("Building base {}", base_path_rel.display()), 1, total, &cancel)?;
+    update_status(status, format!("Building base {obj_path}"), 1, total, &cancel)?;
     let second_status = run_make(project_dir, base_path_rel, &config);
 
     let time = OffsetDateTime::now_utc();
 
     let mut first_obj = if first_status.success {
-        update_status(status, format!("Loading target {}", target_path_rel.display()), 2, total, &cancel)?;
+        update_status(status, format!("Loading target {obj_path}"), 2, total, &cancel)?;
-        Some(elf::read(&obj_config.target_path).with_context(|| {
+        Some(elf::read(&target_path)?)
-            format!("Failed to read object '{}'", obj_config.target_path.display())
-        })?)
     } else {
         None
     };
 
     let mut second_obj = if second_status.success {
-        update_status(status, format!("Loading base {}", base_path_rel.display()), 3, total, &cancel)?;
+        update_status(status, format!("Loading base {obj_path}"), 3, total, &cancel)?;
-        Some(elf::read(&obj_config.base_path).with_context(|| {
+        Some(elf::read(&base_path)?)
-            format!("Failed to read object '{}'", obj_config.base_path.display())
-        })?)
     } else {
         None
     };

src/views/config.rs

@@ -17,7 +17,7 @@ use globset::Glob;
 use self_update::cargo_crate_version;
 
 use crate::{
-    app::{AppConfig, AppConfigRef, ObjectConfig},
+    app::{AppConfig, AppConfigRef},
     config::{ProjectObject, ProjectObjectNode},
     jobs::{
         check_update::{start_check_update, CheckUpdateResult},
@@ -79,7 +79,7 @@ impl ConfigViewState {
     }
 }
 
-pub const DEFAULT_WATCH_PATTERNS: &[&str] = &[
+const DEFAULT_WATCH_PATTERNS: &[&str] = &[
     "*.c", "*.cp", "*.cpp", "*.cxx", "*.h", "*.hp", "*.hpp", "*.hxx", "*.s", "*.S", "*.asm",
     "*.inc", "*.py", "*.yml", "*.txt", "*.json",
 ];
@@ -129,7 +129,7 @@ pub fn config_ui(
         selected_wsl_distro,
         target_obj_dir,
         base_obj_dir,
-        selected_obj,
+        obj_path,
         auto_update_check,
         objects,
         object_nodes,
@@ -205,9 +205,9 @@ pub fn config_ui(
         }
     });
 
-    let mut new_selected_obj = selected_obj.clone();
-    if objects.is_empty() {
     if let (Some(base_dir), Some(target_dir)) = (base_obj_dir, target_obj_dir) {
+        let mut new_build_obj = obj_path.clone();
+        if objects.is_empty() {
             if ui.button("Select object").clicked() {
                 if let Some(path) = rfd::FileDialog::new()
                     .set_directory(&target_dir)
@@ -215,34 +215,19 @@ pub fn config_ui(
                     .pick_file()
                 {
                     if let Ok(obj_path) = path.strip_prefix(&base_dir) {
-                        let target_path = target_dir.join(obj_path);
+                        new_build_obj = Some(obj_path.display().to_string());
-                        new_selected_obj = Some(ObjectConfig {
-                            name: obj_path.display().to_string(),
-                            target_path,
-                            base_path: path,
-                            reverse_fn_order: None,
-                        });
                     } else if let Ok(obj_path) = path.strip_prefix(&target_dir) {
-                        let base_path = base_dir.join(obj_path);
+                        new_build_obj = Some(obj_path.display().to_string());
-                        new_selected_obj = Some(ObjectConfig {
-                            name: obj_path.display().to_string(),
-                            target_path: path,
-                            base_path,
-                            reverse_fn_order: None,
-                        });
                     }
                 }
             }
-            if let Some(obj) = selected_obj {
+            if let Some(obj) = obj_path {
                 ui.label(
-                    RichText::new(&obj.name)
+                    RichText::new(&*obj)
                         .color(appearance.replace_color)
                         .family(FontFamily::Monospace),
                 );
             }
-        } else {
-            ui.colored_label(appearance.delete_color, "Missing project settings");
-        }
         } else {
             let had_search = !state.object_search.is_empty();
             egui::TextEdit::singleline(&mut state.object_search).hint_text("Filter").ui(ui);
@@ -259,7 +244,7 @@ pub fn config_ui(
                     node_open = NodeOpen::Open;
                 }
                 if ui
-                .add_enabled(selected_obj.is_some(), egui::Button::new("⌖").small())
+                    .add_enabled(obj_path.is_some(), egui::Button::new("⌖").small())
                     .on_hover_text_at_pointer("Current object")
                     .clicked()
                 {
@@ -294,34 +279,38 @@ pub fn config_ui(
 
                 ui.style_mut().wrap = Some(false);
                 for node in nodes.iter() {
-                display_node(ui, &mut new_selected_obj, node, appearance, node_open);
+                    display_node(ui, &mut new_build_obj, node, appearance, node_open);
                 }
             });
         }
-    if new_selected_obj != *selected_obj {
+
-        if let Some(obj) = new_selected_obj {
+        if new_build_obj != *obj_path {
+            if let Some(obj) = new_build_obj {
                 // Will set obj_changed, which will trigger a rebuild
-            config_guard.set_selected_obj(obj);
+                config_guard.set_obj_path(obj);
             }
         }
-    if config_guard.selected_obj.is_some()
+        if config_guard.obj_path.is_some()
             && ui.add_enabled(!state.build_running, egui::Button::new("Build")).clicked()
         {
             state.queue_build = true;
         }
+    } else {
+        ui.colored_label(appearance.delete_color, "Missing project settings");
+    }
 
     ui.separator();
 }
 
 fn display_object(
     ui: &mut egui::Ui,
-    selected_obj: &mut Option<ObjectConfig>,
+    obj_path: &mut Option<String>,
     name: &str,
     object: &ProjectObject,
     appearance: &Appearance,
 ) {
-    let object_name = object.name();
+    let path_string = object.path.to_string_lossy().to_string();
-    let selected = matches!(selected_obj, Some(obj) if obj.name == object_name);
+    let selected = matches!(obj_path, Some(path) if path == &path_string);
     let color = if selected { appearance.emphasized_text_color } else { appearance.text_color };
     if SelectableLabel::new(
         selected,
@@ -335,12 +324,7 @@ fn display_object(
     .ui(ui)
     .clicked()
     {
-        *selected_obj = Some(ObjectConfig {
+        *obj_path = Some(path_string);
-            name: object_name.to_string(),
-            target_path: object.target_path.clone().unwrap_or_default(),
-            base_path: object.base_path.clone().unwrap_or_default(),
-            reverse_fn_order: object.reverse_fn_order,
-        });
     }
 }
 
@@ -355,17 +339,17 @@ enum NodeOpen {
 
 fn display_node(
     ui: &mut egui::Ui,
-    selected_obj: &mut Option<ObjectConfig>,
+    obj_path: &mut Option<String>,
     node: &ProjectObjectNode,
     appearance: &Appearance,
     node_open: NodeOpen,
 ) {
     match node {
         ProjectObjectNode::File(name, object) => {
-            display_object(ui, selected_obj, name, object, appearance);
+            display_object(ui, obj_path, name, object, appearance);
         }
         ProjectObjectNode::Dir(name, children) => {
-            let contains_obj = selected_obj.as_ref().map(|path| contains_node(node, path));
+            let contains_obj = obj_path.as_ref().map(|path| contains_node(node, path));
             let open = match node_open {
                 NodeOpen::Default => None,
                 NodeOpen::Open => Some(true),
@@ -388,18 +372,21 @@ fn display_node(
             .open(open)
             .show(ui, |ui| {
                 for node in children {
-                    display_node(ui, selected_obj, node, appearance, node_open);
+                    display_node(ui, obj_path, node, appearance, node_open);
                 }
             });
         }
     }
 }
 
-fn contains_node(node: &ProjectObjectNode, selected_obj: &ObjectConfig) -> bool {
+fn contains_node(node: &ProjectObjectNode, path: &str) -> bool {
     match node {
-        ProjectObjectNode::File(_, object) => object.name() == selected_obj.name,
+        ProjectObjectNode::File(_, object) => {
+            let path_string = object.path.to_string_lossy().to_string();
+            path == path_string
+        }
         ProjectObjectNode::Dir(_, children) => {
-            children.iter().any(|node| contains_node(node, selected_obj))
+            children.iter().any(|node| contains_node(node, path))
         }
     }
 }
@@ -457,12 +444,11 @@ fn pick_folder_ui(
     label: &str,
     tooltip: impl FnOnce(&mut egui::Ui),
     appearance: &Appearance,
-    enabled: bool,
 ) -> egui::Response {
     let response = ui.horizontal(|ui| {
         subheading(ui, label, appearance);
         ui.link(HELP_ICON).on_hover_ui(tooltip);
-        ui.add_enabled(enabled, egui::Button::new("Select"))
+        ui.button("Select")
     });
     ui.label(format_path(dir, appearance));
     response.inner
@@ -520,7 +506,6 @@ fn split_obj_config_ui(
             ui.label(job);
         },
         appearance,
-        true,
     );
     if response.clicked() {
         if let Some(path) = rfd::FileDialog::new().pick_folder() {
@@ -581,7 +566,6 @@ fn split_obj_config_ui(
                 ui.label(job);
             },
             appearance,
-            !config.project_config_loaded,
         );
         if response.clicked() {
             if let Some(path) = rfd::FileDialog::new().set_directory(&project_dir).pick_folder() {
@@ -631,7 +615,6 @@ fn split_obj_config_ui(
                 ui.label(job);
             },
             appearance,
-            !config.project_config_loaded,
         );
         if response.clicked() {
             if let Some(path) = rfd::FileDialog::new().set_directory(&project_dir).pick_folder() {
@@ -643,7 +626,7 @@ fn split_obj_config_ui(
 
     subheading(ui, "Watch settings", appearance);
     let response =
-        ui.checkbox(&mut config.rebuild_on_changes, "Rebuild on changes").on_hover_ui(|ui| {
+        ui.checkbox(&mut config.watcher_enabled, "Rebuild on changes").on_hover_ui(|ui| {
             let mut job = LayoutJob::default();
             job.append(
                 "Automatically re-run the build & diff when files change.",

src/views/jobs.rs

@@ -1,4 +1,4 @@
-use egui::{ProgressBar, RichText, Widget};
+use egui::{ProgressBar, Widget};
 
 use crate::{jobs::JobQueue, views::appearance::Appearance};
 
@@ -31,7 +31,7 @@ pub fn jobs_ui(ui: &mut egui::Ui, jobs: &mut JobQueue, appearance: &Appearance)
             bar.ui(ui);
             const STATUS_LENGTH: usize = 80;
             if let Some(err) = &status.error {
-                let err_string = format!("{:#}", err);
+                let err_string = err.to_string();
                 ui.colored_label(
                     appearance.delete_color,
                     if err_string.len() > STATUS_LENGTH - 10 {
@@ -39,15 +39,13 @@ pub fn jobs_ui(ui: &mut egui::Ui, jobs: &mut JobQueue, appearance: &Appearance)
                     } else {
                         format!("Error: {:width$}", err_string, width = STATUS_LENGTH - 7)
                     },
-                )
+                );
-                .on_hover_text_at_pointer(RichText::new(err_string).color(appearance.delete_color));
             } else {
                 ui.label(if status.status.len() > STATUS_LENGTH - 3 {
                     format!("{}…", &status.status[0..STATUS_LENGTH - 3])
                 } else {
                     format!("{:width$}", &status.status, width = STATUS_LENGTH)
-                })
+                });
-                .on_hover_text_at_pointer(&status.status);
             }
         });
     }

src/views/symbol_diff.rs

@@ -62,14 +62,19 @@ impl DiffViewState {
 
         self.symbol_state.disable_reverse_fn_order = false;
         if let Ok(config) = config.read() {
-            if let Some(obj_config) = &config.selected_obj {
+            if let Some(obj_path) = &config.obj_path {
-                if let Some(value) = obj_config.reverse_fn_order {
+                if let Some(object) = config.objects.iter().find(|object| {
+                    let path_string = object.path.to_string_lossy().to_string();
+                    &path_string == obj_path
+                }) {
+                    if let Some(value) = object.reverse_fn_order {
                         self.symbol_state.reverse_fn_order = value;
                         self.symbol_state.disable_reverse_fn_order = true;
                     }
                 }
             }
         }
+    }
 
     pub fn post_update(&mut self, _jobs: &mut JobQueue, config: &AppConfigRef) {
         if self.queue_build {