Fix accidental load of default keymap *after* loading user keymap

Max Brunsfeld , Mikayla , and Marshall created 2 years ago

Co-authored-by: Mikayla <[e-mail]>
Co-authored-by: Marshall <[e-mail]>

Change summary

crates/zed/src/zed.rs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Detailed changes

crates/zed/src/zed.rs

@@ -400,7 +400,6 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
             });
 
         workspace.focus_handle(cx).focus(cx);
-        load_default_keymap(cx);
     })
     .detach();
 }
@@ -571,6 +570,8 @@ pub fn handle_keymap_file_changes(
     })
     .detach();
 
+    load_default_keymap(cx);
+
     cx.spawn(move |cx| async move {
         let mut user_keymap = KeymapFile::default();
         loop {