Skip to content

Commit bbf7ef6

Browse files
committed
Merge branch 'hotfix/0.9.1.1073'
2 parents bc5670e + 9eae969 commit bbf7ef6

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# Version 0.9.1.1073 - 2017-10-28
2+
3+
## Fixes
4+
- Fix infinite loading bug on macOS High Sierra 10.13
5+
6+
7+
8+
19
# Version 0.9.0.1014 - 2017-04-18
210

311
## Additions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# On The Roadside
22

3-
[![Version](https://img.shields.io/badge/Version-0.9.0.1014-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
3+
[![Version](https://img.shields.io/badge/Version-0.9.1.1073-blue.svg)](https://github.com/rm-code/on-the-roadside/releases/latest)
44
[![LOVE](https://img.shields.io/badge/L%C3%96VE-0.10.2-EA316E.svg)](http://love2d.org/)
55
[![Build Status](https://travis-ci.com/rm-code/On-The-Roadside.svg?token=q3rLXeyGTBN9VB2zsWMr&branch=develop)](https://travis-ci.com/rm-code/On-The-Roadside)
66

lib/TGFParser.lua

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ local TGFParser = {
3232
-- Line iterator
3333
-- ------------------------------------------------
3434

35-
local lines = love and love.filesystem.lines or io.lines;
35+
-- TODO love.filesystem.lines is currently bugged on Mac OS 10.13
36+
-- therefore we have to use a quick workaround
37+
-- local lines = love and love.filesystem.lines or io.lines;
3638

3739
-- ------------------------------------------------
3840
-- Local Functions
@@ -51,7 +53,10 @@ local function loadFile( path )
5153
local target = nodes;
5254

5355
-- Change the target table once the '#' separator is reached.
54-
for line in lines( path ) do
56+
-- TODO love.filesystem.lines is currently bugged on Mac OS 10.13
57+
-- therefore we have to use a quick workaround
58+
local str = love.filesystem.read(path)
59+
for line in str:gmatch("^[\r\n]+") do
5560
if line == '#' then
5661
target = edges;
5762
else

version.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
local version = {
22
major = 0,
33
minor = 9,
4-
patch = 0,
5-
build = 1014,
4+
patch = 1,
5+
build = 1073,
66
}
77

88
return string.format( "%d.%d.%d.%d", version.major, version.minor, version.patch, version.build );

0 commit comments

Comments
 (0)