Fix OpenXcom#593

SupSuper · SupSuper · commit 6ed4a5cc5def · 2014-05-07T16:50:29.000+01:00
Memorial CTDs with Storage Limits set to yes
diff --git a/src/Basescape/SoldierInfoState.cpp b/src/Basescape/SoldierInfoState.cpp
@@ -565,7 +565,7 @@ void SoldierInfoState::edtSoldierChange(Action *action)
 void SoldierInfoState::btnOkClick(Action *)
 {
 	_game->popState();
-	if (_game->getSavedGame()->getMonthsPassed() > -1 && Options::storageLimitsEnforced && _base->storesOverfull())
+	if (_game->getSavedGame()->getMonthsPassed() > -1 && Options::storageLimitsEnforced && _base != 0 && _base->storesOverfull())
 	{
 		_game->pushState(new SellState(_game, _base));
 		_game->pushState(new ErrorMessageState(_game, tr("STR_STORAGE_EXCEEDED").arg(_base->getName()).c_str(), _palette, Palette::blockOffset(15)+1, "BACK01.SCR", 0));

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ void SoldierInfoState::edtSoldierChange(Action *action)`
`565`	`565`	`void SoldierInfoState::btnOkClick(Action *)`
`566`	`566`	`{`
`567`	`567`	`_game->popState();`
`568`		`- if (_game->getSavedGame()->getMonthsPassed() > -1 && Options::storageLimitsEnforced && _base->storesOverfull())`
	`568`	`+ if (_game->getSavedGame()->getMonthsPassed() > -1 && Options::storageLimitsEnforced && _base != 0 && _base->storesOverfull())`
`569`	`569`	`{`
`570`	`570`	`_game->pushState(new SellState(_game, _base));`
`571`	`571`	`_game->pushState(new ErrorMessageState(_game, tr("STR_STORAGE_EXCEEDED").arg(_base->getName()).c_str(), _palette, Palette::blockOffset(15)+1, "BACK01.SCR", 0));`