From 2746381e4925908706bd6c24843bd607136bfaea Mon Sep 17 00:00:00 2001
From: avolkov <avolkov@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sat, 4 Jul 2009 08:11:39 +0000
Subject: [PATCH] Fixed potential crashes when loading savegames from a
 Homeworld encounter screen; bug #1062

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3170 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/sc2code/planets/genorz.c | 2 +-
 sc2/src/sc2code/planets/gensyr.c | 2 +-
 sc2/src/sc2code/planets/genzoq.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sc2/src/sc2code/planets/genorz.c b/sc2/src/sc2code/planets/genorz.c
index f0086573c..f7a333b10 100644
--- a/sc2/src/sc2code/planets/genorz.c
+++ b/sc2/src/sc2code/planets/genorz.c
@@ -176,7 +176,7 @@ GenerateAndrosynth (BYTE control)
 void
 GenerateOrz (BYTE control)
 {
-	if (CurStarDescPtr->Index == ANDROSYNTH_DEFINED)
+	if (CurStarDescPtr && CurStarDescPtr->Index == ANDROSYNTH_DEFINED)
 	{
 		GenerateAndrosynth (control);
 		return;
diff --git a/sc2/src/sc2code/planets/gensyr.c b/sc2/src/sc2code/planets/gensyr.c
index 68be4642b..b1cfd1ee5 100644
--- a/sc2/src/sc2code/planets/gensyr.c
+++ b/sc2/src/sc2code/planets/gensyr.c
@@ -63,7 +63,7 @@ GenerateTrap (BYTE control)
 void
 GenerateSyreen (BYTE control)
 {
-	if (CurStarDescPtr->Index == MYCON_TRAP_DEFINED)
+	if (CurStarDescPtr && CurStarDescPtr->Index == MYCON_TRAP_DEFINED)
 	{
 		GenerateTrap (control);
 		return;
diff --git a/sc2/src/sc2code/planets/genzoq.c b/sc2/src/sc2code/planets/genzoq.c
index 62506fafb..35a79872b 100644
--- a/sc2/src/sc2code/planets/genzoq.c
+++ b/sc2/src/sc2code/planets/genzoq.c
@@ -83,7 +83,7 @@ GenerateScout (BYTE control)
 void
 GenerateZoqFotPik (BYTE control)
 {
-	if (CurStarDescPtr->Index == ZOQ_SCOUT_DEFINED)
+	if (CurStarDescPtr && CurStarDescPtr->Index == ZOQ_SCOUT_DEFINED)
 	{
 		GenerateScout (control);
 		return;