[python] fix scripts run directly that aren't an add-on. fixes #14265 #4382

Merged
merged 1 commit into from Mar 9, 2014

Projects

None yet

2 participants

@jmarshallnz
Member

@jimfcarroll I think this is fine as is. It happens where the user (or a script) calls RunScript(/path/to/some/script.py), where we therefore don't have an add-on object.

@jmarshallnz
Member

jenkins build this please

@jmarshallnz jmarshallnz added the Gotham label Mar 9, 2014
@jmarshallnz jmarshallnz added this to the Gotham13.0-beta2 milestone Mar 9, 2014
@jimfcarroll
Member

It looks like the jenkins failure is unrelated.

It looks like there's 2 places this could affect and both of them pass responsibility for interpreting the addon id back to a python script. One is in the python Addon object. The other is in the python Monitor object. So this should fix the crash and scripts will need to handle an empty string return value.

Looks good to me.

@jmarshallnz jmarshallnz merged commit e042b65 into xbmc:master Mar 9, 2014

1 check failed

default Merged build #338 failed in 27 min
Details
@jmarshallnz jmarshallnz deleted the jmarshallnz:fix_non_addon_scripts branch Mar 9, 2014
@jmarshallnz
Member

Thanks :)

@jmarshallnz jmarshallnz removed the Gotham label Mar 9, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment