From 8e4142aa8eecceac138b460ffd27abf38697a55c Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Tue, 18 Dec 2012 14:11:54 -0800
Subject: [PATCH] Give EditSessions a chance to render before displaying alerts

---
 src/app/editor.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 88c88e638..84749403b 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -455,7 +455,7 @@ class Editor extends View
     @resetDisplay()
 
     if @attached and @activeEditSession.buffer.isInConflict()
-      @showBufferConflictAlert(@activeEditSession)
+      setTimeout(( =>@showBufferConflictAlert(@activeEditSession)), 0) # Display after editSession has a chance to display
 
   showBufferConflictAlert: (editSession) ->
     atom.confirm(