Make the NS buffer copy happen before we need it

* src/nsterm.m ([EmacsView viewWillDraw]): Move releaseContext to updateLayer.
([EmacsView updateLayer]): Send a request for getContext, which will
copy the buffer and create the context if it doesn't already exist, to
the NS run loop.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/nsterm.m b/src/nsterm.m
index 6b6ad0c016c..f6168243a49 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8482,8 +8482,6 @@ not_in_argv (NSString *arg)
       unblock_input ();
       waiting_for_input = owfi;
     }
-
-  [surface releaseContext];
 }
 
 
@@ -8515,7 +8513,11 @@ not_in_argv (NSString *arg)
      There's a private method, -[CALayer setContentsChanged], that we
      could use to force it, but we shouldn't often get the same
      surface twice in a row.  */
+  [surface releaseContext];
   [[self layer] setContents:(id)[surface getSurface]];
+  [surface performSelectorOnMainThread:@selector (getContext)
+                            withObject:nil
+                         waitUntilDone:NO];
 }
 #endif