generate OCIO extraction directory BEFORE setting C locale for OCIO

2020-10-29 01:39:22 +11:00
parent 10d2ea823c
commit 59241f9023
1 changed files with 4 additions and 3 deletions
@@ -69,6 +69,10 @@ OCIO::ConstConfigRcPtr ColorManager::GetDefaultConfig()

 void ColorManager::SetUpDefaultConfig()
 {
+  // Extract OCIO config - kind of hacky, but it'll work
+  // Must do this before setting C locale
+  QString dir = QDir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)).filePath(QStringLiteral("ocioconf"));
+
  OCIO_SET_C_LOCALE_FOR_SCOPE;

  if (!qgetenv("OCIO").isEmpty()) {
@@ -82,9 +86,6 @@ void ColorManager::SetUpDefaultConfig()
    }
  }

-  // Extract OCIO config - kind of hacky, but it'll work
-  QString dir = QDir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)).filePath(QStringLiteral("ocioconf"));
-
  FileFunctions::CopyDirectory(QStringLiteral(":/ocioconf"),
                               dir,
                               true);