From 6391dc7f28fe75f1a318dedda615f2788de1d7f2 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 6 Oct 2014 10:51:02 +1100
Subject: [PATCH] FIX: hitting edit while replying does nothing

---
 app/assets/javascripts/discourse/controllers/composer.js.es6 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index d7a39ee81dc..9e2e43e8c66 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -316,7 +316,8 @@ export default DiscourseController.extend({
 
         // If we're already open, we don't have to do anything
         if (composerModel.get('composeState') === Discourse.Composer.OPEN &&
-            composerModel.get('draftKey') === opts.draftKey) {
+            composerModel.get('draftKey') === opts.draftKey &&
+            composerModel.action === opts.action) {
           return resolve();
         }