summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Bridle <ben@derelict.engineering>2025-09-19 11:47:43 +1200
committerBen Bridle <ben@derelict.engineering>2025-09-19 11:48:41 +1200
commit661b4012654c8b41a782adf6a5cc1092b8942803 (patch)
tree12ee614b569b31f1315a3fc3d234fb61237e7557
parent62e42e6082e8d7ff359d7b6bbdbd9eb1549956df (diff)
downloadbedrock-pc-661b4012654c8b41a782adf6a5cc1092b8942803.zip
Print phosphor event loop errors
If the phosphor event loop could not be started, the returned error will be printed in the error message. This commit also updates the phosphor dependency to version 3.3.2, which returns the actual error object when an event loop error occurs.
-rw-r--r--Cargo.lock4
-rw-r--r--Cargo.toml2
-rw-r--r--src/bin/br/main.rs9
3 files changed, 8 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock
index d8426e1..6e9cfe7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1117,8 +1117,8 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "phosphor"
-version = "3.3.1"
-source = "git+git://benbridle.com/phosphor?tag=v3.3.1#62fd7d9cf17bb3510396be54e23babb545d8c7ed"
+version = "3.3.2"
+source = "git+git://benbridle.com/phosphor?tag=v3.3.2#37d89379b77ea9032c83da570e4382834ae148c6"
dependencies = [
"buffer",
"event-queue",
diff --git a/Cargo.toml b/Cargo.toml
index 304c763..72ffb28 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ description = "Bedrock emulator"
[dependencies]
bedrock-asm = { git = "git://benbridle.com/bedrock-asm", tag = "v1.0.1" }
bedrock-core = { git = "git://benbridle.com/bedrock-core", tag = "v1.0.0" }
-phosphor = { git = "git://benbridle.com/phosphor", tag = "v3.3.1" }
+phosphor = { git = "git://benbridle.com/phosphor", tag = "v3.3.2" }
geometry = { git = "git://benbridle.com/geometry", tag = "v1.0.0" }
inked = { git = "git://benbridle.com/inked", tag = "v1.0.0" }
log = { git = "git://benbridle.com/log", tag = "v2.0.0" }
diff --git a/src/bin/br/main.rs b/src/bin/br/main.rs
index 11505cb..da11a18 100644
--- a/src/bin/br/main.rs
+++ b/src/bin/br/main.rs
@@ -130,8 +130,8 @@ fn main() {
symbols_path, name, identifier, title, icon,
};
- if let Ok(phosphor) = Phosphor::new() {
- match mode {
+ match Phosphor::new() {
+ Ok(phosphor) => match mode {
Mode::Dynamic => {
info!("Starting graphical emulator (hidden)");
let mut emulator = GraphicalEmulator::new(config, debug);
@@ -151,9 +151,9 @@ fn main() {
emulator.run();
}
}
- } else {
- match mode {
+ Err(err) => match mode {
Mode::Dynamic => {
+ eprintln!("EventLoopError: {err:?}");
info!("Could not start graphical event loop");
info!("Starting headless emulator");
let mut emulator = HeadlessEmulator::new(&config, debug);
@@ -161,6 +161,7 @@ fn main() {
emulator.run();
}
Mode::Graphical => {
+ eprintln!("EventLoopError: {err:?}");
fatal!("Could not start graphical event loop");
}
Mode::Headless => {