summaryrefslogtreecommitdiff
path: root/client/Config.cpp
diff options
context:
space:
mode:
authorAlex <b0ris@b0ris-satellite.localdomain>2011-11-05 19:03:04 +0200
committerAlex <b0ris@b0ris-satellite.localdomain>2011-11-05 19:03:04 +0200
commitc34e933ae10ac5ffd7c0e06cf5fa62aa95eb536a (patch)
tree8b93a20f8d5bafb4672a788c64ed5352e848f252 /client/Config.cpp
parentf1889d6c4b2c658177bfce08f41b6e1c337aec5e (diff)
parent544c4714a4e1f6b5bedf7b58d07080c5a6dee860 (diff)
Fix conflicting Config.cpp
Diffstat (limited to 'client/Config.cpp')
-rwxr-xr-x[-rw-r--r--]client/Config.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/Config.cpp b/client/Config.cpp
index 8ba72d0..f7b30cd 100644..100755
--- a/client/Config.cpp
+++ b/client/Config.cpp
@@ -23,7 +23,7 @@ Config::Config(): QObject(), StaticProxySpeedLow(50)
configValid = false;
Logger::Info("Parsing config.cfg to determine initial configuration\n");
- ifstream configFile("config.cfg", std::ios::in);
+ ifstream configFile(QString(this_app->applicationDirPath()+ "/config.cfg").toUtf8().data(), std::ios::in);
if (!configFile)
{
Logger::Fatal("Can't open file: config.cfg\n");
@@ -330,4 +330,4 @@ Config::ServerEntry::ServerEntry(string entry)
start = end+1;
end = entry.find(' ');
retry = atoi(entry.substr(start, end).c_str());
-} \ No newline at end of file
+}