adds missing NULL check in CPluginDirectory::SetSetting
[epg] fixed - epg load/update was interrupted when the pvr manager imports channels, leading to delays and channel ids gone missing in certain situations
Merge branch 'master' into master-dev

* master:
  [epg] fixed - epg load/update was interrupted when the pvr manager imports channels, leading to delays and channel ids gone missing in certain situations
  adds missing NULL check in CPluginDirectory::SetSetting
Merge branch 'master-dev' into master-dev-tegra2

* master-dev:
  [epg] fixed - epg load/update was interrupted when the pvr manager imports channels, leading to delays and channel ids gone missing in certain situations
  adds missing NULL check in CPluginDirectory::SetSetting