From eaa453335563d670d856da44bf4ea1f332c618a7 Mon Sep 17 00:00:00 2001
From: rhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544>
Date: Wed, 30 May 2012 13:26:32 +0000
Subject: Ensure check for NULL pointer occurs prior to use, not after

---
 Stars45/MsnEditNavDlg.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Stars45/MsnEditNavDlg.cpp')

diff --git a/Stars45/MsnEditNavDlg.cpp b/Stars45/MsnEditNavDlg.cpp
index 5c71757..5be7807 100644
--- a/Stars45/MsnEditNavDlg.cpp
+++ b/Stars45/MsnEditNavDlg.cpp
@@ -1,6 +1,6 @@
 /*  Project Starshatter 4.5
 	Destroyer Studios LLC
-	Copyright © 1997-2004. All Rights Reserved.
+	Copyright (C) 1997-2004. All Rights Reserved.
 
 	SUBSYSTEM:    Stars.exe
 	FILE:         MsnEditNavDlg.cpp
@@ -174,10 +174,10 @@ MsnEditNavDlg::ScrapeForm()
 		Galaxy*     galaxy = Galaxy::GetInstance();
 		StarSystem* system = 0;
 
-		if (galaxy)
+		if (galaxy && cmb_system)
 		system = galaxy->GetSystem(cmb_system->GetSelectedItem());
 
-		if (cmb_system && system) {
+		if (system) {
 			mission->ClearSystemList();
 			mission->SetStarSystem(system);
 
-- 
cgit v1.1