ScudLee/xbmc — comment on commit c62a002d6957df3ad196116d22228468af022357
File: xbmc/utils/URIUtils.cpp line 538
By ScudLee:

That certainly sounds like a better approach (this bit did feel a bit hacky... and it's the main bit).
I'll test it to tomorrow and update.