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

1 files changed, 10 insertions, 3 deletions

diff --git a/updater/main.cpp b/updater/main.cpp
index b0198f6..a345d58 100644
--- a/updater/main.cpp
+++ b/updater/main.cpp
@@ -1,5 +1,5 @@
 
-#ifdef WINDOWS
+#ifdef WIN32
     #define ClientName      "client.exe"
    	#define PathSlash		"\\"
 #else
@@ -18,10 +18,17 @@ using std::string;
 int main(int argc, char* argv[])
 {
     Logger::Info("Starting updater application\n");
-
     string path = argv[0];
+	QString dir;	
 	size_t p = path.find_last_of(PathSlash);
-	QString dir = QString::fromStdString(path.substr(0, p));
+	if (p == string::npos)
+	{
+		dir = QString::fromStdString(".");
+	}
+	else
+	{
+		dir = QString::fromStdString(path.substr(0, p));
+	}
 	Logger::Trace("Application path: %s\n", dir.toStdString().c_str());
 
     // check if whether client.bin.latest exists