From 86c0f41c9e4d1908c81f40181ebb2e42b0122a1e Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 12 Apr 2021 14:38:18 -0700
Subject: [PATCH] Move set_menus method to MutableAppContext

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
---
 gpui/src/app.rs | 8 ++++----
 zed/src/main.rs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gpui/src/app.rs b/gpui/src/app.rs
index 97030a48e3..8602dd1b25 100644
--- a/gpui/src/app.rs
+++ b/gpui/src/app.rs
@@ -191,10 +191,6 @@ impl App {
         self
     }
 
-    pub fn set_menus(&self, menus: Vec<Menu>) {
-        self.0.borrow().platform.set_menus(menus);
-    }
-
     pub fn run<F>(self, on_finish_launching: F)
     where
         F: 'static + FnOnce(&mut MutableAppContext),
@@ -567,6 +563,10 @@ impl MutableAppContext {
         result
     }
 
+    pub fn set_menus(&self, menus: Vec<Menu>) {
+        self.platform.set_menus(menus);
+    }
+
     pub fn dispatch_action<T: 'static + Any>(
         &mut self,
         window_id: usize,
diff --git a/zed/src/main.rs b/zed/src/main.rs
index 7edb0eecd5..3aaddff884 100644
--- a/zed/src/main.rs
+++ b/zed/src/main.rs
@@ -12,8 +12,8 @@ fn main() {
 
     let app = gpui::App::new(assets::Assets).unwrap();
     let (_, settings_rx) = settings::channel(&app.font_cache()).unwrap();
-    app.set_menus(menus::menus(settings_rx.clone()));
     app.run(move |ctx| {
+        ctx.set_menus(menus::menus(settings_rx.clone()));
         workspace::init(ctx);
         editor::init(ctx);
         file_finder::init(ctx);