From 33f8bd69180567f82c1c0f0773beff01e65ec688 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 11 Nov 2014 03:36:56 -0500
Subject: [PATCH] Fix bug where cancelling switch from HTML to plain text didn't set editor type selector properly (#1490141)

---
 CHANGELOG         |    1 +
 program/js/app.js |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1e3022a..21fea50 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -61,6 +61,7 @@
 - Fix bug where contacts with no email address were listed on compose addressbook (#1489970)
 - Fix images import from various vCard formats (#1489977)
 - Fix sorting messages by size on servers without SORT capability (#1489981)
+- Fix bug where cancelling switch from HTML to plain text didn't set editor type selector properly (#1490141)
 
 RELEASE 1.0.1
 -------------
diff --git a/program/js/app.js b/program/js/app.js
index 6e0d690..fe9dadd 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3439,6 +3439,8 @@
     }
     else if (this.html2plain(tinyMCE.get(props.id).getContent(), props.id))
       tinyMCE.execCommand('mceRemoveControl', false, props.id);
+    else
+      return false;
 
     return true;
   };

--
Gitblit v1.9.1