TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

pstats: Fix crash when frame has only level data and no time data

Browse Source
This commit is contained in:
rdb 2022-02-22 15:25:04 +01:00
parent a33fcab8da
commit 759115fbc7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/pstatclient/pStatFrameData.I
View File

@ -105,7 +105,7 @@ add_level(int index, double level) {
*/ */
INLINE double PStatFrameData:: INLINE double PStatFrameData::
get_start() const { get_start() const {
if (is_empty()) { if (is_time_empty()) {
return 0.0; return 0.0;
} }
@ -118,7 +118,7 @@ get_start() const {
*/ */
INLINE double PStatFrameData:: INLINE double PStatFrameData::
get_end() const { get_end() const {
nassertr(!is_empty(), 0.0); nassertr(!is_time_empty(), 0.0);
return _time_data.back()._value; return _time_data.back()._value;
} }
@ -128,7 +128,7 @@ get_end() const {
*/ */
INLINE double PStatFrameData:: INLINE double PStatFrameData::
get_net_time() const { get_net_time() const {
nassertr(!is_empty(), 0.0); nassertr(!is_time_empty(), 0.0);
return _time_data.back()._value - _time_data.front()._value; return _time_data.back()._value - _time_data.front()._value;
} }

2
pandatool/src/pstatserver/pStatThreadData.cxx
View File

@ -267,7 +267,7 @@ record_new_frame(int frame_number, PStatFrameData *frame_data) {
double oldest_allowable_time = time - _history; double oldest_allowable_time = time - _history;
while (!_frames.empty() && while (!_frames.empty() &&
(_frames.front() == nullptr || (_frames.front() == nullptr ||
_frames.front()->is_empty() || _frames.front()->is_time_empty() ||
_frames.front()->get_start() < oldest_allowable_time)) { _frames.front()->get_start() < oldest_allowable_time)) {
delete _frames.front(); delete _frames.front();
_frames.pop_front(); _frames.pop_front();