Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2018-05-08 12:18:21 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2018-05-08 12:18:45 +0300
commit271624b0f6b97cc2198332b40c60a784eebd462e (patch)
tree6f721fc6bf6368e83a51982739a332fb2c590cc0 /source/blender/editors/screen
parentfaaffc401171d301b87dfdabcec2aa15130be3db (diff)
Prevent segfault when opening file browser while a 2.79 file was loaded.
Loading a file that was written with the master branch into the 2.8 branch, and then trying to load or save, caused a segfault.
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r--source/blender/editors/screen/screen_edit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index d024262121c..8ebdb5f32b8 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1150,7 +1150,7 @@ static bScreen *screen_fullscreen_find_associated_normal_screen(const Main *bmai
{
for (bScreen *screen_iter = bmain->screen.first; screen_iter; screen_iter = screen_iter->id.next) {
ScrArea *sa = screen_iter->areabase.first;
- if (sa->full == screen) {
+ if (sa && sa->full == screen) {
return screen_iter;
}
}