LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 12:14:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent needless seeking in File:lines on closed files (issue #1377)

Browse Source
This commit is contained in:
Bart van Strien
2018-02-10 12:06:30 +01:00
parent 53872d813a
commit fc9fcd2626
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/filesystem/wrap_File.cpp
+2 -4
View File
@@ -282,14 +282,12 @@ int w_File_lines_i(lua_State *L)
// If the user has changed the position, we need to seek back first // If the user has changed the position, we need to seek back first
int64 pos = file->tell(); int64 pos = file->tell();
int64 userpos = -1; int64 userpos = -1;
if (!lua_isnoneornil(L, lua_upvalueindex(4))) if (luax_toboolean(L, lua_upvalueindex(5)))
{ {
userpos = pos; userpos = pos;
pos = (int64) lua_tonumber(L, lua_upvalueindex(4)); pos = (int64) lua_tonumber(L, lua_upvalueindex(4));
if (userpos != pos) if (userpos != pos)
file->seek(pos); file->seek(pos);
else
userpos = -1;
} }
// Keep reading until newline or EOF // Keep reading until newline or EOF
@@ -353,7 +351,7 @@ int w_File_lines(lua_State *L)
lua_pushstring(L, ""); // buffer lua_pushstring(L, ""); // buffer
lua_pushnumber(L, 0); // buffer offset lua_pushnumber(L, 0); // buffer offset
lua_pushnumber(L, 0); // File position. lua_pushnumber(L, 0); // File position.
luax_pushboolean(L, file->getMode() != File::MODE_CLOSED); // Save current file mode. luax_pushboolean(L, file->getMode() != File::MODE_CLOSED); // Save current file position.
if (file->getMode() != File::MODE_READ) if (file->getMode() != File::MODE_READ)
{ {