diff --git a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp index 15648f62..9f85f786 100644 --- a/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp +++ b/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp @@ -226,8 +226,11 @@ plVirtualCam1::~plVirtualCam1() // for saving camera stack plCameraModifier1* plVirtualCam1::GetCameraNumber(size_t camNumber) -{ - return (fCameraStack[camNumber]); +{ + if (fCameraStack.size() > camNumber) + return fCameraStack[camNumber]; + else + return nil; } // for rebuilding camera stack void plVirtualCam1::RebuildStack(const plKey& key) diff --git a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp index 1efb9e2e..94c0562f 100644 --- a/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp @@ -2462,7 +2462,7 @@ int cyMisc::GetNumCameras() const char* cyMisc::GetCameraNumber(int number) { plCameraModifier1* pCam = plVirtualCam1::Instance()->GetCameraNumber(number-1); - if (pCam->GetTarget()) + if (pCam && pCam->GetTarget()) { const char* ret = pCam->GetTarget()->GetKeyName().c_str(); plString str = plString::Format("saving camera named %s to chronicle\n",ret);