move config file code
@@ -539,7 +539,6 @@ void conf_handle_option( const char opt[], const char val[] ) {
break;
#endif
case oConfig:
- conf_load_file( val );
conf_str( opt, &gconf->configfile, val );
break;
case oMode:
@@ -702,5 +701,9 @@ void conf_load_args( int argc, char **argv ) {
}
}
+ if( gconf->configfile ) {
+ conf_load_file( gconf->configfile );
+ }
+
conf_check();
}
