From d9838df4cd106839287c23eb8cc09e451c615df2 Mon Sep 17 00:00:00 2001 From: adrian-kong Date: Tue, 23 May 2023 08:40:05 +1000 Subject: [PATCH 1/3] title-dash? --- console_backend/src/status_bar.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/console_backend/src/status_bar.rs b/console_backend/src/status_bar.rs index 461967af7..0df880d6a 100644 --- a/console_backend/src/status_bar.rs +++ b/console_backend/src/status_bar.rs @@ -166,10 +166,12 @@ impl StatusBar { status_bar_status.set_ins(&sb_update.ins_status); status_bar_status.set_data_rate(sb_update.data_rate); status_bar_status.set_solid_connection(sb_update.solid_connection); - status_bar_status.set_title(&format!( - "{} - Swift Console {}", - sb_update.port, sb_update.version - )); + let port = if sb_update.port.is_empty() { + "" + } else { + sb_update.port + " - " + }; + status_bar_status.set_title(&format!("{port}Swift Console {}", sb_update.version)); client_sender.send_data(serialize_capnproto_builder(builder)); } From 2b62c13664ed1286f3ef54756200d34aace1e202 Mon Sep 17 00:00:00 2001 From: adrian-kong <35755741+adrian-kong@users.noreply.github.com> Date: Tue, 23 May 2023 09:06:05 +1000 Subject: [PATCH 2/3] Update console_backend/src/status_bar.rs Co-authored-by: Jason Mobarak --- console_backend/src/status_bar.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/console_backend/src/status_bar.rs b/console_backend/src/status_bar.rs index 0df880d6a..2c9343428 100644 --- a/console_backend/src/status_bar.rs +++ b/console_backend/src/status_bar.rs @@ -171,7 +171,7 @@ impl StatusBar { } else { sb_update.port + " - " }; - status_bar_status.set_title(&format!("{port}Swift Console {}", sb_update.version)); + status_bar_status.set_title(&format!("{}Swift Console {}", port, sb_update.version)); client_sender.send_data(serialize_capnproto_builder(builder)); } From 8bd11d6c5a62df9cc2ee04c189d241627d54a31a Mon Sep 17 00:00:00 2001 From: adrian-kong <35755741+adrian-kong@users.noreply.github.com> Date: Tue, 23 May 2023 09:09:20 +1000 Subject: [PATCH 3/3] Update console_backend/src/status_bar.rs --- console_backend/src/status_bar.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/console_backend/src/status_bar.rs b/console_backend/src/status_bar.rs index 2c9343428..b4141f5aa 100644 --- a/console_backend/src/status_bar.rs +++ b/console_backend/src/status_bar.rs @@ -167,7 +167,7 @@ impl StatusBar { status_bar_status.set_data_rate(sb_update.data_rate); status_bar_status.set_solid_connection(sb_update.solid_connection); let port = if sb_update.port.is_empty() { - "" + "".to_string() } else { sb_update.port + " - " };