Do not write settings to disk if only generating LV2 ttl
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
parent
64ba23c5e2
commit
d80c2e5c96
2 changed files with 21 additions and 8 deletions
|
@ -426,6 +426,12 @@ Initializer::Initializer(const CardinalBasePlugin* const plugin, const CardinalB
|
||||||
random::init();
|
random::init();
|
||||||
ui::init();
|
ui::init();
|
||||||
|
|
||||||
|
#ifdef CARDINAL_COMMON_UI_ONLY
|
||||||
|
constexpr const bool isRealInstance = true;
|
||||||
|
#else
|
||||||
|
const bool isRealInstance = !plugin->isDummyInstance();
|
||||||
|
#endif
|
||||||
|
|
||||||
if (asset::systemDir.empty())
|
if (asset::systemDir.empty())
|
||||||
{
|
{
|
||||||
if (const char* const bundlePath = (plugin != nullptr ? plugin->getBundlePath() :
|
if (const char* const bundlePath = (plugin != nullptr ? plugin->getBundlePath() :
|
||||||
|
@ -480,6 +486,8 @@ Initializer::Initializer(const CardinalBasePlugin* const plugin, const CardinalB
|
||||||
else
|
else
|
||||||
asset::userDir = system::join(homeDir(), "Documents", "Cardinal");
|
asset::userDir = system::join(homeDir(), "Documents", "Cardinal");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (isRealInstance)
|
||||||
system::createDirectory(asset::userDir);
|
system::createDirectory(asset::userDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -493,6 +501,8 @@ Initializer::Initializer(const CardinalBasePlugin* const plugin, const CardinalB
|
||||||
asset::configDir = system::join(xdgEnv, "Cardinal");
|
asset::configDir = system::join(xdgEnv, "Cardinal");
|
||||||
else
|
else
|
||||||
asset::configDir = system::join(homeDir(), ".config", "Cardinal");
|
asset::configDir = system::join(homeDir(), ".config", "Cardinal");
|
||||||
|
|
||||||
|
if (isRealInstance)
|
||||||
system::createDirectory(asset::configDir);
|
system::createDirectory(asset::configDir);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -544,12 +554,11 @@ Initializer::Initializer(const CardinalBasePlugin* const plugin, const CardinalB
|
||||||
INFO("Initializing plugin browser DB");
|
INFO("Initializing plugin browser DB");
|
||||||
app::browserInit();
|
app::browserInit();
|
||||||
|
|
||||||
#ifndef CARDINAL_COMMON_UI_ONLY
|
if (isRealInstance)
|
||||||
if (! plugin->isDummyInstance())
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
INFO("Loading settings");
|
INFO("Loading settings");
|
||||||
settings::load();
|
settings::load();
|
||||||
|
shouldSaveSettings = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// enforce settings that do not make sense as anything else
|
// enforce settings that do not make sense as anything else
|
||||||
|
@ -603,8 +612,11 @@ Initializer::~Initializer()
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (shouldSaveSettings)
|
||||||
|
{
|
||||||
INFO("Save settings");
|
INFO("Save settings");
|
||||||
settings::save();
|
settings::save();
|
||||||
|
}
|
||||||
|
|
||||||
INFO("Clearing asset paths");
|
INFO("Clearing asset paths");
|
||||||
asset::bundlePath.clear();
|
asset::bundlePath.clear();
|
||||||
|
|
|
@ -100,6 +100,7 @@ struct Initializer
|
||||||
#endif
|
#endif
|
||||||
std::string templatePath;
|
std::string templatePath;
|
||||||
std::string factoryTemplatePath;
|
std::string factoryTemplatePath;
|
||||||
|
bool shouldSaveSettings = false;
|
||||||
|
|
||||||
Initializer(const CardinalBasePlugin* plugin, const CardinalBaseUI* ui);
|
Initializer(const CardinalBasePlugin* plugin, const CardinalBaseUI* ui);
|
||||||
~Initializer();
|
~Initializer();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue