Merge branch 'master' of ssh://sss.chaoslab.ru//home/private_git/proxy_ui

1 files changed, 14 insertions, 3 deletions

diff --git a/client/main.cpp b/client/main.cpp
index 4b6d734..f7da59e 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -1,5 +1,5 @@
 
-#ifdef WINDOWS
+#ifdef WIN32
 	#define UpdaterName		"updater.exe"
 	#define PathSlash		"\\"
 #else
@@ -22,9 +22,16 @@ int main(int argc, char *argv[])
 	Logger::Info("Starting client application\n");
 	
 	string path = argv[0];
+	QString dir;	
 	size_t p = path.find_last_of(PathSlash);
-	QString dir = QString::fromStdString(path.substr(0, p));
-	Logger::Trace("Application path: %s\n", dir.toStdString().c_str());
+	if (p == string::npos)
+	{
+		dir = QString::fromStdString(".");
+	}
+	else
+	{
+		dir = QString::fromStdString(path.substr(0, p));
+	}
 	
 	// check if client should be update
 	QFileInfo newClient(dir + PathSlash + "client.bin.latest");
@@ -46,6 +53,10 @@ int main(int argc, char *argv[])
 	// check if initial config exists (config.cfg)
 	// without it application is useless
 	QFileInfo configInfo(dir + PathSlash + "config.cfg");
+	
+	fprintf(stderr, "%s\n", configInfo.fileName().toStdString().c_str());
+	
+	
 	if (! configInfo.exists())
 	{
 		Logger::Fatal("Initial configuration file (config.cfg) do not exist!\n");