[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27283] trunk/blender/source/blender/ editors/space_sequencer/space_sequencer.c: Bugfix for #21452, Crashdown in Video Sequence Editor

[Elia Sarti]

Revision: 27283
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27283
Author:   vekoon
Date:     2010-03-05 20:35:17 +0100 (Fri, 05 Mar 2010)

Log Message:
-----------
Bugfix for #21452, Crashdown in Video Sequence Editor

Added some NULL checks

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c

Modified: trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c	2010-03-05 18:19:32 UTC (rev 27282)
+++ trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c	2010-03-05 19:35:17 UTC (rev 27283)
@@ -110,44 +110,44 @@
 
 	switch (view) {
 		case SEQ_VIEW_SEQUENCE:
-			if (ar_main->flag & RGN_FLAG_HIDDEN) {
+			if (ar_main && (ar_main->flag & RGN_FLAG_HIDDEN)) {
 				ar_main->flag &= ~RGN_FLAG_HIDDEN;
 				ar_main->v2d.flag &= ~V2D_IS_INITIALISED;
 			}
-			if (!(ar_preview->flag & RGN_FLAG_HIDDEN)) {
+			if (ar_preview && !(ar_preview->flag & RGN_FLAG_HIDDEN)) {
 				ar_preview->flag |= RGN_FLAG_HIDDEN;
 				ar_preview->v2d.flag &= ~V2D_IS_INITIALISED;
 				WM_event_remove_handlers(C, &ar_preview->handlers);
 			}
-			ar_main->alignment= RGN_ALIGN_NONE;
-			ar_preview->alignment= RGN_ALIGN_NONE;
+			if (ar_main) ar_main->alignment= RGN_ALIGN_NONE;
+			if (ar_preview) ar_preview->alignment= RGN_ALIGN_NONE;
 			break;
 		case SEQ_VIEW_PREVIEW:
-			if (!(ar_main->flag & RGN_FLAG_HIDDEN)) {
+			if (ar_main && !(ar_main->flag & RGN_FLAG_HIDDEN)) {
 				ar_main->flag |= RGN_FLAG_HIDDEN;
 				ar_main->v2d.flag &= ~V2D_IS_INITIALISED;
 				WM_event_remove_handlers(C, &ar_main->handlers);
 			}
-			if (ar_preview->flag & RGN_FLAG_HIDDEN) {
+			if (ar_preview && (ar_preview->flag & RGN_FLAG_HIDDEN)) {
 				ar_preview->flag &= ~RGN_FLAG_HIDDEN;
 				ar_preview->v2d.flag &= ~V2D_IS_INITIALISED;
 				ar_preview->v2d.cur = ar_preview->v2d.tot;
 			}
-			ar_main->alignment= RGN_ALIGN_NONE;
-			ar_preview->alignment= RGN_ALIGN_NONE;
+			if (ar_main) ar_main->alignment= RGN_ALIGN_NONE;
+			if (ar_preview) ar_preview->alignment= RGN_ALIGN_NONE;
 			break;
 		case SEQ_VIEW_SEQUENCE_PREVIEW:
-			if (ar_main->flag & RGN_FLAG_HIDDEN) {
+			if (ar_main && (ar_main->flag & RGN_FLAG_HIDDEN)) {
 				ar_main->flag &= ~RGN_FLAG_HIDDEN;
 				ar_main->v2d.flag &= ~V2D_IS_INITIALISED;
 			}
-			if (ar_preview->flag & RGN_FLAG_HIDDEN) {
+			if (ar_preview && (ar_preview->flag & RGN_FLAG_HIDDEN)) {
 				ar_preview->flag &= ~RGN_FLAG_HIDDEN;
 				ar_preview->v2d.flag &= ~V2D_IS_INITIALISED;
 				ar_preview->v2d.cur = ar_preview->v2d.tot;
 			}
-			ar_main->alignment= RGN_ALIGN_NONE;
-			ar_preview->alignment= RGN_ALIGN_TOP;
+			if (ar_main) ar_main->alignment= RGN_ALIGN_NONE;
+			if (ar_preview) ar_preview->alignment= RGN_ALIGN_TOP;
 			break;
 	}