forceClose enableSound bit-wise probably wrong. #1215

Merged
merged 1 commit into from Aug 5, 2012

Conversation

Projects
None yet
2 participants
Contributor

jabbera commented Jul 25, 2012

I'm determined to figure out this git thing, yet once again I made a mess of a pull request. This should hopefully be better.

(forceClose ? 0x01 : 0 | enableSound ? 0x02 : 0);
is actually (forceClose ? 0x01 : (0 | enableSound) ? 0x02 : 0); based on operator precedence of bit-wise or.

I'm pretty sure based on usage at: https://github.com/xbmc/xbmc/blob/master/xbmc/ApplicationMessenger.cpp#L676

that it should be:
((forceClose ? 0x01 : 0) | (enableSound ? 0x02 : 0));

I'm going to admit I haven't tested this.

Mike (forceClose ? 0x01 : 0 | enableSound ? 0x02 : 0);
is actually (forceClose ? 0x01 : (0 | enableSound) ? 0x02 : 0); based on operator precedence of bit-wise or.
b2abab5
Member

jmarshallnz commented Jul 25, 2012

Please work it out without mailing over 100 people every time you muck around!

Contributor

jabbera commented Jul 25, 2012

Sorry, not really sure what happened. I forgot to merge before I sent my pull request.

Member

jmarshallnz commented Jul 25, 2012

When you do a pull req it shows how many commits are gonna be in it - take note.

The code looks valid.

@jmarshallnz jmarshallnz added a commit that referenced this pull request Aug 5, 2012

@jmarshallnz jmarshallnz Merge pull request #1215 from jabbera/ApplicationMessagerCloseBug
forceClose enableSound bit-wise probably wrong.
068cd79

@jmarshallnz jmarshallnz merged commit 068cd79 into xbmc:master Aug 5, 2012

@tru tru added a commit to plexinc/plex-home-theater-public that referenced this pull request May 29, 2014

@tru tru Make the minimum size of the window 512x288.
Fixes #1215
5b08cd1

@tru tru added a commit to RasPlex/plex-home-theatre that referenced this pull request Aug 21, 2014

@tru @LongChair tru + LongChair Make the minimum size of the window 512x288.
Fixes #1215
390a136
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment