From d608088a64e961409e9b201fe83d050e7bfb90e3 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 25 Mar 2013 19:48:01 +0100
Subject: Fix saving draft just after entering compose window (#1489012)

Conflicts:

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

(limited to 'program')

diff --git a/program/js/app.js b/program/js/app.js
index 32328358a..87cdf3b3d 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -949,8 +949,8 @@ function rcube_webmail()
         // Reset the auto-save timer
         clearTimeout(this.save_timer);
 
-        // compose form did not change
-        if (this.cmp_hash == this.compose_field_hash()) {
+        // compose form did not change (and draft wasn't saved already)
+        if (this.draft_saved && this.cmp_hash == this.compose_field_hash()) {
           this.auto_save_start();
           break;
         }
@@ -3345,6 +3345,7 @@ function rcube_webmail()
 
   this.set_draft_id = function(id)
   {
+    this.draft_saved = id;
     $("input[name='_draft_saveid']").val(id);
   };
 
-- 
cgit v1.2.3