summaryrefslogtreecommitdiff
path: root/src/client/Client.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-14 17:14:06 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-14 17:14:06 (GMT)
commitfc1274f381d3c9b375779c9dcbd4d43ba1e26f58 (patch)
tree72aef6ed3761e0d5ad1184d4d8cc484c8b10f782 /src/client/Client.cpp
parenta7711668b73854dac259e5ad49e8c4e56b63dafe (diff)
downloadpowder-fc1274f381d3c9b375779c9dcbd4d43ba1e26f58.zip
powder-fc1274f381d3c9b375779c9dcbd4d43ba1e26f58.tar.gz
Fix crash caused by malformed preference files, fixes #110
Diffstat (limited to 'src/client/Client.cpp')
-rw-r--r--src/client/Client.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index f6744cf..4d08f14 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -83,9 +83,9 @@ Client::Client():
configFile.seekg(0, std::ios::beg);
if(fsize)
{
- json::Reader::Read(configDocument, configFile);
try
{
+ json::Reader::Read(configDocument, configFile);
authUser.ID = ((json::Number)(configDocument["User"]["ID"])).Value();
authUser.SessionID = ((json::String)(configDocument["User"]["SessionID"])).Value();
authUser.SessionKey = ((json::String)(configDocument["User"]["SessionKey"])).Value();
@@ -102,7 +102,7 @@ Client::Client():
catch (json::Exception &e)
{
authUser = User(0, "");
- std::cerr << "Error: Client [Read User data from pref] " << e.what() << std::endl;
+ std::cerr << "Error: Could not read data from prefs: " << e.what() << std::endl;
}
}
configFile.close();