summaryrefslogtreecommitdiffhomepage
path: root/Stars45/MsnEditDlg.cpp
diff options
context:
space:
mode:
authorrhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544>2012-05-30 13:26:32 +0000
committerrhyskidd <rhyskidd@076cb2c4-205e-83fd-5cf3-1be9aa105544>2012-05-30 13:26:32 +0000
commiteaa453335563d670d856da44bf4ea1f332c618a7 (patch)
treea976bf3e0fc4b690042915745e637eb6b00929e4 /Stars45/MsnEditDlg.cpp
parent035cfd86e5d221cffb2673e936dcb8703e28ce4b (diff)
downloadstarshatter-eaa453335563d670d856da44bf4ea1f332c618a7.zip
starshatter-eaa453335563d670d856da44bf4ea1f332c618a7.tar.gz
starshatter-eaa453335563d670d856da44bf4ea1f332c618a7.tar.bz2
Ensure check for NULL pointer occurs prior to use, not after
Diffstat (limited to 'Stars45/MsnEditDlg.cpp')
-rw-r--r--Stars45/MsnEditDlg.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Stars45/MsnEditDlg.cpp b/Stars45/MsnEditDlg.cpp
index f81b6c3..ed8f912 100644
--- a/Stars45/MsnEditDlg.cpp
+++ b/Stars45/MsnEditDlg.cpp
@@ -1,6 +1,6 @@
/* Project Starshatter 5.0
Destroyer Studios LLC
- Copyright © 1997-2007. All Rights Reserved.
+ Copyright (C) 1997-2007. All Rights Reserved.
SUBSYSTEM: Stars.exe
FILE: MsnEditDlg.cpp
@@ -478,10 +478,10 @@ MsnEditDlg::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);