Skip to content

Commit 882b9ad

Browse files
committed
Merge branch 'main' into jan/upload-img
2 parents e6178e9 + 32812da commit 882b9ad

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

crates/re_viewer/src/app.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,20 @@ impl App {
115115
);
116116
}
117117

118-
let state: AppState = if startup_options.persist_state {
118+
let mut state: AppState = if startup_options.persist_state {
119119
storage
120120
.and_then(|storage| eframe::get_value(storage, eframe::APP_KEY))
121121
.unwrap_or_default()
122122
} else {
123123
AppState::default()
124124
};
125125

126+
// Forget the blueprint we used for some unknown app,
127+
// so we don't reuse it for some unrelated unknown app.
128+
// This is in particularly important for `rerun foo.png`
129+
// followed by `rerun bar.png`, which both uses the unknow App ID.
130+
state.blueprints.remove(&ApplicationId::unknown());
131+
126132
let mut analytics = ViewerAnalytics::new();
127133
analytics.on_viewer_started(&build_info, app_env);
128134

crates/re_viewer/src/ui/viewport.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ fn space_view_ui(
770770
) {
771771
let Some(latest_at) = ctx.rec_cfg.time_ctrl.time_int() else {
772772
ui.centered_and_justified(|ui| {
773-
ui.label(ctx.re_ui.warning_text("No time selected"));
773+
ui.weak("No time selected");
774774
});
775775
return
776776
};

0 commit comments

Comments
 (0)