Merge pull request #2013 from stupid-boy/master

[rbp/omx] fixed propper lock/unlock in omclock
xbmc · Jan 2, 2013 · 1a39106 · 1a39106
2 parents ffa3e48 + a2db346
commit 1a39106
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/xbmc/linux/OMXClock.cpp b/xbmc/linux/OMXClock.cpp
@@ -334,7 +334,8 @@ bool OMXClock::OMXSetReferenceClock(bool lock /* = true */)
     ret = false;
   }
 
-  UnLock();
+  if(lock)
+    UnLock();
 
   return ret;
 }
@@ -634,7 +635,8 @@ bool OMXClock::OMXReset(bool lock /* = true */)
 
   if(!OMXSetReferenceClock(false))
   {
-    UnLock();
+    if(lock)
+      UnLock();
     return false;
   }