[geany/geany] e69bbe: Merge pull request #342 from ntrel/save-disk-check

[Nick Treleaven]

Branch:      refs/heads/master
Author:      Nick Treleaven <nick.treleaven at btinternet.com>
Committer:   Nick Treleaven <nick.treleaven at btinternet.com>
Date:        Mon, 06 Oct 2014 11:20:54 UTC
Commit:      e69bbe25fd49d8a31a06bed395bcc9c65efa0563
             https://github.com/geany/geany/commit/e69bbe25fd49d8a31a06bed395bcc9c65efa0563

Log Message:
-----------
Merge pull request #342 from ntrel/save-disk-check

Force disk check before save to prevent accidental overwriting


Modified Paths:
--------------
    src/document.c

Modified: src/document.c
3 lines changed, 1 insertions(+), 2 deletions(-)
===================================================================
@@ -1937,10 +1937,9 @@ gboolean document_save_file(GeanyDocument *doc, gboolean force)
 			_("Cannot save read-only document '%s'!"), DOC_FILENAME(doc));
 		return FALSE;
 	}
+	document_check_disk_status(doc, TRUE);
 	if (doc->priv->protected)
-	{
 		return save_file_handle_infobars(doc, force);
-	}
 
 	fp = project_get_file_prefs();
 	/* replaces tabs with spaces but only if the current file is not a Makefile */



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).