summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorNiklas2011-11-04 11:56:28 +0100
committerNiklas2011-11-04 11:56:28 +0100
commit5d215d54cbb33f3ef5fb4f5da9a860b0a105ae9b (patch)
tree8965df059ab3acff163d0b7c907f35754472ee23 /src/main.cpp
parentchanged the tryout, also some big changes in program flow. there is now userc... (diff)
downloadfbgui-5d215d54cbb33f3ef5fb4f5da9a860b0a105ae9b.tar.gz
fbgui-5d215d54cbb33f3ef5fb4f5da9a860b0a105ae9b.tar.xz
fbgui-5d215d54cbb33f3ef5fb4f5da9a860b0a105ae9b.zip
last changes
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp8
1 files changed, 8 insertions, 0 deletions
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;