From 5d215d54cbb33f3ef5fb4f5da9a860b0a105ae9b Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 4 Nov 2011 11:56:28 +0100 Subject: last changes --- src/main.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 837cf6e..a187d01 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -195,24 +195,32 @@ int main(int argc, char *argv[]) { // if (clOpts.contains("server")) gServerIp = clOpts.value("server"); + else if (confFileSettings.contains("default/server")) + gServerIp = confFileSettings.value("default/server").toString(); else gServerIp = "209.85.148.105"; //that is a google server. change this to a proper default address // if (clOpts.contains("autoup")) gAutoUp = true; + else if (confFileSettings.contains("default/autoup")) + gAutoUp = confFileSettings.value("default/autoup").toBool(); else gAutoUp = false; // if (clOpts.contains("socketserverpath")) gSocketServerPath = clOpts.value("socketserverpath"); + else if (confFileSettings.contains("default/socketserverpath")) + gSocketServerPath = confFileSettings.value("default/socketserverpath").toString(); else gSocketServerPath = DEFAULT_QTSOCKETADDRESS; // if (clOpts.contains("pathtoexe")) gPathToDhcpExe = clOpts.value("pathtoexe"); + else if (confFileSettings.contains("default/pathtoexe")) + gPathToDhcpExe = confFileSettings.value("default/pathtoexe").toString(); else gPathToDhcpExe = DEFAULT_PATHTODHCPCDEXE; -- cgit v1.2.3-55-g7522