Merge lp:~niclasl/scratch/fix-1299240 into lp:~elementary-apps/scratch/scratch

[Niclas Lockner]

fixed bug #1299240

After a document has been opened from the files manager plugin, it is immediately saved due to the save call in the focus out callback. (After the doc is opened, the focus is back at the files manager plugin.)
Since the document's content is loaded asynchronously, the save action is performed before the content has been read from the file.

In this branch, the focus out callback only saves the document if it has been fully loaded.

[lp:~niclasl/scratch/fix-1299240]

1275. By Niclas Lockner on 2014-04-10

Moved the not-loaded check to save. Changed the type back to a bool

1276. By Niclas Lockner on 2014-04-11

Only load the content once

[Niclas Lockner (niclasl)]

I've pushed two new commits to the branch. The fix is better now than when I requested the merge.

[Danielle Foré (danrabbit)]

This definitely fixes the issue for me. Hope your branch gets reviewed soon :)

[Mario Guerriero (mefrio-g)]

review: Approve

=== modified file 'src/Services/Document.vala'
--- src/Services/Document.vala	2014-04-09 01:00:52 +0000
+++ src/Services/Document.vala	2014-04-11 14:25:16 +0000
@@ -52,6 +52,7 @@
         
         // It is used to load file content on focusing
         private bool loaded = false;
+        private bool has_started_loading = false;
         
 #if HAVE_ZEITGEIST
         // Zeitgeist integration
@@ -163,6 +164,7 @@
                 if (settings.autosave) {
                     save ();
                 }
+
                 return false;
             });
 
@@ -249,7 +251,10 @@
         public bool save () {
             if (last_saved_content == get_text () && this.file != null)
                 return false;
-                
+
+            if (!this.loaded)
+                return false;
+
             // Create backup copy file if it does not still exist
             create_backup ();
 
@@ -480,7 +485,7 @@
         
         // Load file content
         internal void load_content () {
-            if (!this.loaded) {
+            if (!this.has_started_loading) {
                 FileHandler.load_content_from_file.begin (file, (obj, res) => {
                     var text = FileHandler.load_content_from_file.end (res);
                     if (text == null) {
@@ -493,8 +498,10 @@
                     this.source_view.set_text (text);
                     this.last_saved_content = text;
                     this.original_content = text;
+                    this.loaded = true;
                  });
-                 this.loaded = true;
+
+                this.has_started_loading = true;
             }
         }
         
@@ -653,5 +660,5 @@
             return this.file.query_exists ();
         }
     }
-
 }
+