[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43838] trunk/blender/source/blender/ editors/space_buttons/buttons_ops.c: fix [#28296] File selector crash when with filepath property

Campbell Barton ideasman42 at gmail.com
Thu Feb 2 06:55:11 CET 2012


Revision: 43838
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43838
Author:   campbellbarton
Date:     2012-02-02 05:55:01 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
fix [#28296] File selector crash when with filepath property

disable browsing a file property within the file selector to avoid a crash.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_buttons/buttons_ops.c

Modified: trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_ops.c	2012-02-02 05:11:42 UTC (rev 43837)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_ops.c	2012-02-02 05:55:01 UTC (rev 43838)
@@ -43,6 +43,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
+#include "BKE_report.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -160,6 +161,11 @@
 	FileBrowseOp *fbo;
 	char *str;
 
+	if (CTX_wm_space_file(C)) {
+		BKE_report(op->reports, RPT_ERROR, "Can't activate a file selector, one already open");
+		return OPERATOR_CANCELLED;
+	}
+
 	uiFileBrowseContextProperty(C, &ptr, &prop);
 
 	if(!prop)




More information about the Bf-blender-cvs mailing list