Adjust #ifdef block

pljones · pljones · commit 4c6ab68d576b · 2023-10-22T09:48:13.000+01:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -597,20 +597,19 @@ int main ( int argc, char** argv )
         bUseGUI = false;
         qWarning() << "No GUI support compiled. Running in headless mode.";
     }
-#endif
 
-    if ( bIsClient )
+#endif
 #ifdef SERVER_ONLY
+    if ( bIsClient )
     {
         qCritical() << "Only --server mode is supported in this build.";
         exit ( 1 );
     }
-#else
-
-    // TODO create settings in default state, if loading from file do that next, then come back here to
-    //      override from command line options, then create client or server, letting them do the validation
 
+#else
+    if ( bIsClient )
     {
+
         if ( ServerOnlyOptions.size() != 0 )
         {
             qCritical() << qUtf8Printable ( QString ( "%1: Server only option(s) '%2' used.  Did you omit '--server'?" )

Original file line number	Diff line number	Diff line change
`@@ -597,20 +597,19 @@ int main ( int argc, char** argv )`
`597`	`597`	`bUseGUI = false;`
`598`	`598`	`qWarning() << "No GUI support compiled. Running in headless mode.";`
`599`	`599`	`}`
`600`		`-#endif`
`601`	`600`
`602`		`- if ( bIsClient )`
	`601`	`+#endif`
`603`	`602`	`#ifdef SERVER_ONLY`
	`603`	`+ if ( bIsClient )`
`604`	`604`	`{`
`605`	`605`	`qCritical() << "Only --server mode is supported in this build.";`
`606`	`606`	`exit ( 1 );`
`607`	`607`	`}`
`608`		`-#else`
`609`		`-`
`610`		`- // TODO create settings in default state, if loading from file do that next, then come back here to`
`611`		`- // override from command line options, then create client or server, letting them do the validation`
`612`	`608`
	`609`	`+#else`
	`610`	`+ if ( bIsClient )`
`613`	`611`	`{`
	`612`	`+`
`614`	`613`	`if ( ServerOnlyOptions.size() != 0 )`
`615`	`614`	`{`
`616`	`615`	`qCritical() << qUtf8Printable ( QString ( "%1: Server only option(s) '%2' used. Did you omit '--server'?" )`