Fix error in User_Memory_Init_Pools #1109
Conversation
Codecov ReportAttention:
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## develop #1109 +/- ##
===========================================
- Coverage 2.54% 2.54% -0.01%
===========================================
Files 949 949
Lines 110299 110300 +1
Branches 18881 18881
===========================================
Hits 2802 2802
- Misses 107094 107095 +1
Partials 403 403 ☔ View full report in Codecov by Sentry. |
src/w3d/renderer/ddsfile.cpp
Outdated
| @@ -592,6 +592,7 @@ bool DDSFileClass::Load() | |||
|
|
|||
| if (data == 0) { | |||
| captainslog_warn("DDSFile '%s' appears to contain no data, size is %d.", m_name, fp->Size()); | |||
| fp->Close(); | |||
There was a problem hiding this comment.
auto_file_ptr should indirectly be doing that?
There was a problem hiding this comment.
right, comment as bugfix
There was a problem hiding this comment.
Perhaps the right fix here is then to auto close on destruction of auto_file_ptr instead.
I will take a look if there are more places where auto_file_ptr is missing call to Close.
There was a problem hiding this comment.
Original auto_file_ptr didn't call Close, we should keep it that way.
There was a problem hiding this comment.
I have reverted change to DDSFileClass::Load and will make a new Pull for auto_file_ptr
There was a problem hiding this comment.
I have taken another look at auto_file_ptr and GameFileClass in debugger. It does call Close on destruction via virtual destructor:
GameFileClass::~GameFileClass()
{
Close();
}So this needs no change.
xezon
force-pushed
the
fix-error-ddsfileclass-load
branch
from
e1209f8 to
04d1fc5
Compare
xezon
changed the title
xezon
force-pushed
the
fix-error-ddsfileclass-load
branch
from
04d1fc5 to
1105b4e
Compare
This claims to be a fix for a Thyme specific issue.