Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[upnp] startup honors user settings. #10249

Merged
merged 1 commit into from Aug 13, 2016

Conversation

Projects
None yet
3 participants
@MartijnKaijser
Copy link
Member

commented Aug 7, 2016

Patch from @Rallymen007
#10072

Ping @Montellese

@MartijnKaijser MartijnKaijser force-pushed the MartijnKaijser:upnp branch from fdfcc5c to 851af62 Aug 13, 2016

@MartijnKaijser

This comment has been minimized.

Copy link
Member Author

commented Aug 13, 2016

jenkins build and merge

@jenkins4kodi jenkins4kodi merged commit 852f4d7 into xbmc:master Aug 13, 2016

0 of 4 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details
default I've found some spare time so building this now
Details
jenkins.kodi.tv Yeah yeah I'll get to it when i have some time
Details
@Montellese

This comment has been minimized.

Copy link
Member

commented Aug 13, 2016

Sorry for the (too) late reply. To match our coding style the curly braces should be removed.

And for the upnp controller to work the server has to be running as well i.e. the controller must only be started if the server is enabled as well. That's also how it is in the settings i.e. the controller setting is greyed out if the server isn't enabled.

@MartijnKaijser

This comment has been minimized.

Copy link
Member Author

commented Aug 13, 2016

oops sorry. Best revert this instead of adjusting?

@Montellese

This comment has been minimized.

Copy link
Member

commented Aug 13, 2016

Follow-up PR is enough.

@MartijnKaijser MartijnKaijser deleted the MartijnKaijser:upnp branch Sep 2, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.