Skip to content

Conversation

1aam2am1
Copy link
Contributor

@1aam2am1 1aam2am1 commented Feb 8, 2016

Trying to load a non-existing font file crashes an Android app #1056

@1aam2am1 1aam2am1 closed this Feb 8, 2016
@1aam2am1 1aam2am1 changed the title Issue #1056 Trying to load a non-existing font file crashes an Android app Feb 18, 2016
@1aam2am1 1aam2am1 reopened this Feb 18, 2016
@MarioLiebisch
Copy link
Member

Could you try to unify the coding style regarding the if() brackets?

@eXpl0it3r
Copy link
Member

Could you squash the commits?

@eXpl0it3r
Copy link
Member

@1aam2am1 Could you squash the commits?

@1aam2am1
Copy link
Contributor Author

I have no idea what you mean. I don't know so well github and English.

@Bromeon
Copy link
Member

Bromeon commented Apr 3, 2016

Squashing means merging the commits to a single one. You can do that with git's interactive rebase (git rebase -i).

If you want, we can also do it for you (signed-off-by).

@eXpl0it3r
Copy link
Member

Anyone willing to do it with signed-off-by? Maybe @MarioLiebisch?

@eXpl0it3r
Copy link
Member

Bump

Update ResourceStream.cpp
@mantognini
Copy link
Member

@MarioLiebisch Beside the extra braces, do you think it's mergeable?

@MarioLiebisch
Copy link
Member

Braces are fixed in the updated commit, It could just need a better message. Maybe just cherry-pick it?

@eXpl0it3r
Copy link
Member

Any suggestions for the better message?

@MarioLiebisch
Copy link
Member

In my local copy before noticing the quotes being fixed already:

Added pointer checks to Android's resource stream

This fixes issue #1056.

@eXpl0it3r
Copy link
Member

This PR has been added to my merge list, meaning it will be merged soon, unless someone raises any concerns.

@eXpl0it3r
Copy link
Member

Merged in 36bb3c4

@eXpl0it3r eXpl0it3r closed this Jul 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants