diff --git a/services/gam/src/main.rs b/services/gam/src/main.rs index f0f157c97..97c42bbb6 100644 --- a/services/gam/src/main.rs +++ b/services/gam/src/main.rs @@ -665,8 +665,14 @@ fn wrapped_main() -> ! { buffer.replace(spec).unwrap(); } Some(Opcode::DefaultApp) => { - // FIXME: Switch to shellchat here - log::error!("not implemented yet, switch to shellchat: {:?}", msg); + if let Some(new_app_token) = context_mgr.find_app_token_by_name(INITIAL_APP_FOCUS) { + match context_mgr.activate(&gfx, &mut canvases, new_app_token, true) { + Ok(_) => (), + Err(_) => log::warn!("failed to switch to {}, silent error!", switchapp.app_name.as_str().unwrap()), + } + } else { + log::warn!("Request to switch to default app, but the default app has not registered itself yet!"); + } } Some(Opcode::Quit) => break, None => {log::error!("unhandled message {:?}", msg);}