[geany/geany] 8c4db2: Fix file saving behavior with "allow_always_save"

[Quentin Glidic]

Branch:      refs/heads/master
Author:      Quentin Glidic <sardemff7+git at sardemff7.net>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sun, 02 Dec 2012 16:22:06 UTC
Commit:      8c4db25396842c4c4ad08958068e399119e5947d
             https://github.com/geany/geany/commit/8c4db25396842c4c4ad08958068e399119e5947d

Log Message:
-----------
Fix file saving behavior with "allow_always_save"

This preference should only be used for UI action, not for other file
saving triggering.


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

Modified: src/callbacks.c
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -173,7 +173,7 @@ G_MODULE_EXPORT void on_save1_activate(GtkMenuItem *menuitem, gpointer user_data
 
 	if (doc != NULL && cur_page >= 0)
 	{
-		document_save_file(doc, FALSE);
+		document_save_file(doc, ui_prefs.allow_always_save);
 	}
 }
 


Modified: src/document.c
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1701,7 +1701,7 @@ gboolean document_save_file(GeanyDocument *doc, gboolean force)
 	}
 
 	/* the "changed" flag should exclude the "readonly" flag, but check it anyway for safety */
-	if (! force && ! ui_prefs.allow_always_save && (! doc->changed || doc->readonly))
+	if (! force && (! doc->changed || doc->readonly))
 		return FALSE;
 
 	fp = project_get_file_prefs();



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).