From 8bbdad1487974ee6bf694fa260265e163254054a Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 4 Apr 2014 12:36:44 +0200 Subject: [PATCH] FormatManager: actually return the singleton instance. This should work better. --- src/kits/media/FormatManager.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/kits/media/FormatManager.cpp b/src/kits/media/FormatManager.cpp index 29cd2e98b7..0968320bf6 100644 --- a/src/kits/media/FormatManager.cpp +++ b/src/kits/media/FormatManager.cpp @@ -143,11 +143,10 @@ FormatManager::CreateInstance() /* static */ FormatManager* FormatManager::GetInstance() { - static FormatManager* sFormatManager = NULL; - if (sFormatManager == NULL) + if (sInstance == NULL) pthread_once(&sInitOnce, &CreateInstance); - return sFormatManager; + return sInstance; }