[Bf-blender-cvs] [a548924727e] soc-2020-info-editor: Sanitize pointer on startup

[Mateusz Grzeliński]

Commit: a548924727ef2c5d68e489ad821b0a97f6f04232
Author: Mateusz Grzeliński
Date:   Tue Jun 30 11:58:55 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rBa548924727ef2c5d68e489ad821b0a97f6f04232

Sanitize pointer on startup

fixes startup issues

===================================================================

M	source/blender/blenloader/intern/readfile.c
M	source/blender/editors/space_info/space_info.c

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 9c30f0c5ebd..2d79bbcfa9e 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7277,6 +7277,10 @@ static void direct_link_area(BlendDataReader *reader, ScrArea *area)
       sbuts->mainbo = sbuts->mainb;
       sbuts->mainbuser = sbuts->mainb;
     }
+    else if (sl->spacetype == SPACE_INFO) {
+      SpaceInfo *sinfo = (SpaceInfo *)sl;
+      sinfo->active_reports = NULL;
+    }
     else if (sl->spacetype == SPACE_CONSOLE) {
       SpaceConsole *sconsole = (SpaceConsole *)sl;
       ConsoleLine *cl, *cl_next;
diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c
index 79c563d35f5..87dc3e2026c 100644
--- a/source/blender/editors/space_info/space_info.c
+++ b/source/blender/editors/space_info/space_info.c
@@ -127,7 +127,6 @@ static void info_report_source_update(wmWindowManager *wm, SpaceInfo *sinfo)
 static void info_init(struct wmWindowManager *wm, ScrArea *area)
 {
   SpaceInfo *sinfo = area->spacedata.first;
-  // todo startup file with log view on will case active_reports to be not NULL on restart (?)
   if (sinfo->active_reports == NULL) {
     switch (sinfo->view) {
       case INFO_VIEW_REPORTS: {