Skip to content

Commit 5905381

Browse files
committed
move skip option to one level higher; document
1 parent 8707888 commit 5905381

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ You can configure Bonzomatic by creating a `config.json` and placing it next to
3131
The file can have the following contents: (all fields are optional)
3232
``` javascript
3333
{
34+
"skipSetupDialog": true, // If true, setup dialog will be suppressed - all values you provide below will be used without validation (at your own risk!)
3435
"window":{ // default window size / state; if there's a setup dialog, it will override it
3536
"width":1920,
3637
"height":1080,

src/main.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ int main( int argc, const char *argv[] )
100100

101101
FFT::Create();
102102

103+
bool skipSetupDialog = false;
104+
if ( options.has<jsonxx::Boolean>( "skipSetupDialog" ) )
105+
skipSetupDialog = options.get<jsonxx::Boolean>( "skipSetupDialog" );
106+
103107
SetupDialog::SETTINGS settings;
104108
settings.sFFT.bUseRecordingDevice = true;
105109
settings.sFFT.pDeviceID = NULL;
@@ -119,7 +123,6 @@ int main( int argc, const char *argv[] )
119123
settings.sRenderer.nHeight = 1080;
120124
settings.sRenderer.windowMode = RENDERER_WINDOWMODE_FULLSCREEN;
121125

122-
bool skipSetupDialog = false;
123126
if ( options.has<jsonxx::Object>( "window" ) )
124127
{
125128
if ( options.get<jsonxx::Object>( "window" ).has<jsonxx::Number>( "width" ) )
@@ -128,8 +131,6 @@ int main( int argc, const char *argv[] )
128131
settings.sRenderer.nHeight = options.get<jsonxx::Object>( "window" ).get<jsonxx::Number>( "height" );
129132
if ( options.get<jsonxx::Object>( "window" ).has<jsonxx::Boolean>( "fullscreen" ) )
130133
settings.sRenderer.windowMode = options.get<jsonxx::Object>( "window" ).get<jsonxx::Boolean>( "fullscreen" ) ? RENDERER_WINDOWMODE_FULLSCREEN : RENDERER_WINDOWMODE_WINDOWED;
131-
if ( options.get<jsonxx::Object>( "window" ).has<jsonxx::Boolean>( "skipSetupDialog" ) )
132-
skipSetupDialog = options.get<jsonxx::Object>( "window" ).get<jsonxx::Boolean>( "skipSetupDialog" );
133134
}
134135
if ( !skipSetupDialog )
135136
{

0 commit comments

Comments
 (0)