[pvr] optimize channel groups loading/manipulation by avoiding unnecessary sorting and renumbering calls
fixed: race condition when starting a new fresh profile besides master which leads to an abort in cpluff. CAddonInstaller::UpdateRepos is called at startup and still runs if you login and CGUIWindowLoginScreen::LoadProfile calls ADDON::CAddonMgr::Get().ReInit() which leads to an invalid cpluff handle for the update job and aborts XBMC (#13826)
Merge pull request #1993 from wsoltys/profile_fix

fixed: race condition when starting a new fresh profile besides master.
[Confluence] Show Movies and TV Shows by default on the home menu. Fixes #13839
Merge pull request #1982 from nemphys/sortandrenumber

[pvr] optimize channel groups loading/manipulation by avoiding unnecessary ...
Merge pull request #2004 from ronie/confluence-menu

[Confluence] Show Movies and TV Shows by default on home menu. Fixes #13839
jsonrpc: check pointers before dereferencing in CPlayerOperations::GetItem() (fixes #13853)
[addons] sync addons with repo
[pvr] fixed - also update last watched status when opening the stream, so playback resumes on the correct channel and not the previous channel when xbmc crashes or is killed and is restarted (if the option is enabled)
[epg] fixed - don't trigger an update of the main window's data when showing epg info, or we'll switch back to the incorrect line. thanks @ forum user 'coffeecup'
[pvr] throttle connection attempts, no more than 1 attempt per 5 seconds
Merge branch 'master' into master-dev

* master:
  [pvr] throttle connection attempts, no more than 1 attempt per 5 seconds
  [epg] fixed - don't trigger an update of the main window's data when showing epg info, or we'll switch back to the incorrect line. thanks @ forum user 'coffeecup'
  [pvr] fixed - also update last watched status when opening the stream, so playback resumes on the correct channel and not the previous channel when xbmc crashes or is killed and is restarted (if the option is enabled)
  [addons] sync addons with repo
  jsonrpc: check pointers before dereferencing in CPlayerOperations::GetItem() (fixes #13853)
  [Confluence] Show Movies and TV Shows by default on the home menu. Fixes #13839
  fixed: race condition when starting a new fresh profile besides master which leads to an abort in cpluff. CAddonInstaller::UpdateRepos is called at startup and still runs if you login and CGUIWindowLoginScreen::LoadProfile calls ADDON::CAddonMgr::Get().ReInit() which leads to an invalid cpluff handle for the update job and aborts XBMC (#13826)
  [pvr] optimize channel groups loading/manipulation by avoiding unnecessary sorting and renumbering calls
remove vidthumbloader debug
Merge branch 'master-dev' into master-dev-tegra2

* master-dev:
  remove vidthumbloader debug
  [pvr] throttle connection attempts, no more than 1 attempt per 5 seconds
  [epg] fixed - don't trigger an update of the main window's data when showing epg info, or we'll switch back to the incorrect line. thanks @ forum user 'coffeecup'
  [pvr] fixed - also update last watched status when opening the stream, so playback resumes on the correct channel and not the previous channel when xbmc crashes or is killed and is restarted (if the option is enabled)
  [addons] sync addons with repo
  jsonrpc: check pointers before dereferencing in CPlayerOperations::GetItem() (fixes #13853)
  [Confluence] Show Movies and TV Shows by default on the home menu. Fixes #13839
  fixed: race condition when starting a new fresh profile besides master which leads to an abort in cpluff. CAddonInstaller::UpdateRepos is called at startup and still runs if you login and CGUIWindowLoginScreen::LoadProfile calls ADDON::CAddonMgr::Get().ReInit() which leads to an invalid cpluff handle for the update job and aborts XBMC (#13826)
  [pvr] optimize channel groups loading/manipulation by avoiding unnecessary sorting and renumbering calls