Conflict fixed: mainwindow.cpp and httpclient.cpp

[speedfreak] / Client / usersettings.cpp

diff --git a/Client/usersettings.cpp b/Client/usersettings.cpp
index 20046cc..be95562 100644 (file)
--- a/Client/usersettings.cpp
+++ b/Client/usersettings.cpp
@@ -71,7 +71,7 @@ bool loginSaved()
 
     myLogin.readLoginSettings( &userName, &password);
 
-    if (userName.length() > 0)
+    if (userName.compare(""))
     {
         return true;
     }