Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

fix stuff folder initialization

shun-iwasawa7a34e892972d
diff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cpp
index a0131cc99..911651806 100644
--- a/toonz/sources/toonz/main.cpp
+++ b/toonz/sources/toonz/main.cpp
@@ -181,6 +181,9 @@ static void initToonzEnv(QHash<QString, QString> &argPathValues) {
fatalError("Folder \"" + toQString(stuffDir) +
"\" not found or not readable");
+ // Setup third party
+ ThirdParty::initialize();
+
Tiio::defineStd();
initImageIo();
initSoundIo();
@@ -442,21 +445,22 @@ int main(int argc, char *argv[]) {
TEnv::setApplicationFileName(argv[0]);
-// splash screen (override with local file if present)
-QString exeDir = QCoreApplication::applicationDirPath();
-QString localSplashPath = QDir(exeDir).filePath("splash.svg");
+ // splash screen (override with local file if present)
+ QString exeDir = QCoreApplication::applicationDirPath();
+ QString localSplashPath = QDir(exeDir).filePath("splash.svg");
-QPixmap splashPixmap;
+ QPixmap splashPixmap;
-if (QFileInfo(localSplashPath).exists() && QFileInfo(localSplashPath).isFile()) {
- splashPixmap = QIcon(localSplashPath).pixmap(QSize(610, 344));
- if (splashPixmap.isNull()) {
- // fallback if loading fails
+ if (QFileInfo(localSplashPath).exists() &&
+ QFileInfo(localSplashPath).isFile()) {
+ splashPixmap = QIcon(localSplashPath).pixmap(QSize(610, 344));
+ if (splashPixmap.isNull()) {
+ // fallback if loading fails
+ splashPixmap = QIcon(":Resources/splash.svg").pixmap(QSize(610, 344));
+ }
+ } else {
splashPixmap = QIcon(":Resources/splash.svg").pixmap(QSize(610, 344));
}
-} else {
- splashPixmap = QIcon(":Resources/splash.svg").pixmap(QSize(610, 344));
-}
#ifdef _WIN32
QFont font("Segoe UI", -1);
#else
@@ -500,9 +504,6 @@ if (QFileInfo(localSplashPath).exists() && QFileInfo(localSplashPath).isFile())
TBigMemoryManager::instance()->setRunOutOfContiguousMemoryHandler(
&toonzRunOutOfContMemHandler);
- // Setup third party
- ThirdParty::initialize();
-
// Toonz environment
initToonzEnv(argumentPathValues);