aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Carroll <thecarrolls@jiminger.com>2012-09-23 09:31:21 -0400
committerJim Carroll <thecarrolls@jiminger.com>2012-09-23 09:32:14 -0400
commit764b9bd81c313d51df245ceeae927b95efd1d51e (patch)
tree2ee69c159b5c9142b252a6995bbc65cd1182a452
parentfcbfb1d70f64bded8081ab49fd287392718e1a23 (diff)
[fix] potential deadlock in Player.
-rw-r--r--xbmc/interfaces/legacy/Player.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/xbmc/interfaces/legacy/Player.cpp b/xbmc/interfaces/legacy/Player.cpp
index 2006ad38c5..85ed2a6a3f 100644
--- a/xbmc/interfaces/legacy/Player.cpp
+++ b/xbmc/interfaces/legacy/Player.cpp
@@ -57,7 +57,10 @@ namespace XBMCAddon
// we're shutting down so unregister me.
if (languageHook)
+ {
+ DelayedCallGuard dc;
languageHook->unregisterPlayerCallback(this);
+ }
}
void Player::playStream(const String& item, const xbmcgui::ListItem* plistitem, bool windowed)