]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 29 Apr 2011 09:21:33 +0000 (09:21 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 29 Apr 2011 09:21:33 +0000 (09:21 +0000)
modules/flash/flash.cpp

index 6d52fdf0c5425da1899b195c3d7cf8b37045b650..bfd8d7e97cb92d9870a2a8b6a2b5910acfd6c27b 100644 (file)
@@ -39,9 +39,9 @@ std::wstring get_cg_version()
        return L"Unknown";\r
 }\r
 \r
-std::wstring g_version = L"Not found";\r
-void setup_version()\r
-{ \r
+std::wstring get_flash_version()\r
+{              \r
+       std::wstring version = L"Not found";\r
 #ifdef WIN32\r
        HKEY   hkey;\r
  \r
@@ -54,19 +54,12 @@ void setup_version()
                dwSize = sizeof(ver_str);\r
                RegQueryValueEx(hkey, TEXT("Version"), NULL, &dwType, (PBYTE)&ver_str, &dwSize);\r
  \r
-               g_version = ver_str;\r
+               version = ver_str;\r
 \r
                RegCloseKey(hkey);\r
        }\r
 #endif\r
-}\r
-\r
-std::wstring get_flash_version()\r
-{              \r
-       boost::once_flag flag = BOOST_ONCE_INIT;\r
-       boost::call_once(setup_version, flag);\r
-\r
-       return g_version;\r
+       return version;\r
 }\r
 \r
 }\r