Added configuration file bypass launcher key option

This commit is contained in:
Gene Payne
2020-10-02 15:49:27 -06:00
parent fff9a32d97
commit 5d5bfd340b
4 changed files with 5 additions and 1 deletions

View File

@@ -1168,7 +1168,7 @@ int main(int argc, char** argv) {
QApplication* qaobj = nullptr;
LauncherWindow* launchwin = nullptr;
bool skipLauncherSinceProfileAndWindowAreConfiguredInCli =
(haveCliProfile && haveCliSGCTConfig);
(haveCliProfile && haveCliSGCTConfig) || global::configuration.bypassLauncher;
if (!skipLauncherSinceProfileAndWindowAreConfiguredInCli) {
int qac = 0;

View File

@@ -94,6 +94,7 @@ struct Configuration {
glm::dvec3 masterRotation = glm::dvec3(0.0);
bool isConsoleDisabled = false;
bool usingProfile = false;
bool bypassLauncher = false;
std::map<std::string, ghoul::Dictionary> moduleConfigurations;

View File

@@ -244,3 +244,4 @@ OpenGLDebugContext = {
-- FilterSeverity = { }
}
--RenderingMethod = "ABuffer" -- alternative: "Framebuffer"
BypassLauncher = false

View File

@@ -92,6 +92,7 @@ namespace {
constexpr const char* KeySgctConfigNameInitialized = "sgctconfiginitializeString";
constexpr const char* KeyReadOnlyProfiles = "ProfilesReadOnly";
constexpr const char* KeyBypassLauncher = "BypassLauncher";
template <typename T>
void getValue(ghoul::lua::LuaState& L, const char* name, T& value) {
@@ -310,6 +311,7 @@ void parseLuaState(Configuration& configuration) {
getValue(s, KeySgctConfigNameInitialized, c.sgctConfigNameInitialized);
getValue(s, KeyReadOnlyProfiles, c.profilesReadOnly);
getValue(s, KeyBypassLauncher, c.bypassLauncher);
}
std::string findConfiguration(const std::string& filename) {