diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-01 23:56:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-02 14:28:17 +0300 |
| commit | 520a495c466793c29f3e721634dfe6cc616b8ede (patch) | |
| tree | 749b67f5d4df83f6f4997dabeb66ec394eabccd7 /src/client.cpp | |
| parent | f9030497b6196ce2fadb6b6ada5d784be227d9a6 (diff) | |
| download | manaverse-520a495c466793c29f3e721634dfe6cc616b8ede.tar.gz manaverse-520a495c466793c29f3e721634dfe6cc616b8ede.tar.bz2 manaverse-520a495c466793c29f3e721634dfe6cc616b8ede.tar.xz manaverse-520a495c466793c29f3e721634dfe6cc616b8ede.zip | |
Add missing const.
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/client.cpp b/src/client.cpp index 83147d34c..78df4e161 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -440,8 +440,7 @@ void Client::gameInit() if (mCurrentServer.hostname.empty()) { - mCurrentServer.hostname = - branding.getValue("defaultServer", "").c_str(); + mCurrentServer.hostname = branding.getValue("defaultServer", ""); mOptions.serverName = mCurrentServer.hostname; } @@ -2996,12 +2995,12 @@ void Client::setIcon() // Attempt to load icon from .ico file HICON icon = (HICON) LoadImage(nullptr, iconFile.c_str(), IMAGE_ICON, 64, 64, LR_LOADFROMFILE); - if (!icon) - logger->log("icon load error"); // If it's failing, we load the default resource file. if (!icon) + { + logger->log("icon load error"); icon = LoadIcon(GetModuleHandle(nullptr), "A"); - + } if (icon) SetClassLong(pInfo.window, GCL_HICON, reinterpret_cast<LONG>(icon)); #else |