[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18900] branches/blender2.5/blender/source /blender/editors/interface/interface_regions.c: 2.5

Ton Roosendaal ton at blender.org
Tue Feb 10 10:49:36 CET 2009


Revision: 18900
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18900
Author:   ton
Date:     2009-02-10 10:49:36 +0100 (Tue, 10 Feb 2009)

Log Message:
-----------
2.5

Bugfix: CTRL+W "Save file" still gave a 'save over' popup when the
file didn't exist yet. It then attempted to free the operator twice.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c	2009-02-10 09:18:04 UTC (rev 18899)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c	2009-02-10 09:49:36 UTC (rev 18900)
@@ -2301,16 +2301,15 @@
 	if(len==0)
 		return;
 
-	if(BLI_exists(filename)==0)
-		operator_cb(C, op, 1);
-
 	if(filename[len-1]=='/' || filename[len-1]=='\\') {
 		uiPupMenuError(C, "Cannot overwrite a directory");
 		WM_operator_free(op);
 		return;
 	}
-
-	confirm_operator(C, op, "Save over", filename);
+	if(BLI_exists(filename)==0)
+		operator_cb(C, op, 1);
+	else
+		confirm_operator(C, op, "Save over", filename);
 }
 
 void uiPupMenuNotice(bContext *C, char *str, ...)





More information about the Bf-blender-cvs mailing list