summaryrefslogtreecommitdiff
path: root/src/progs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2020-05-30 03:55:29 +0300
committerAndrei Karas <akaras@inbox.ru>2020-05-30 03:55:49 +0300
commit4ea05d37c952b80105a5623865c3dfec35a1bfd5 (patch)
tree078a726682dfd2cefcb3df8b7475278c44d56336 /src/progs
parentaf506ac53ca3308a1d77d040c429c2b51e3147b0 (diff)
downloadplus-4ea05d37c952b80105a5623865c3dfec35a1bfd5.tar.gz
plus-4ea05d37c952b80105a5623865c3dfec35a1bfd5.tar.bz2
plus-4ea05d37c952b80105a5623865c3dfec35a1bfd5.tar.xz
plus-4ea05d37c952b80105a5623865c3dfec35a1bfd5.zip
Fix left style issues from switch port merging
Diffstat (limited to 'src/progs')
-rw-r--r--src/progs/manaplus/actions/actions.cpp3
-rw-r--r--src/progs/manaplus/client.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp
index a4c6a63d2..c367b01ee 100644
--- a/src/progs/manaplus/actions/actions.cpp
+++ b/src/progs/manaplus/actions/actions.cpp
@@ -1528,7 +1528,8 @@ impHandler(dumpTests)
impHandler0(dumpOGL)
{
-#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__native_client__) && !defined(__SWITCH__)
+#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__native_client__) \
+ && !defined(__SWITCH__)
NormalOpenGLGraphics::dumpSettings();
#endif // defined(USE_OPENGL) && !defined(ANDROID) &&
// !defined(__native_client__)
diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp
index 349f02b4b..8670ae4ab 100644
--- a/src/progs/manaplus/client.cpp
+++ b/src/progs/manaplus/client.cpp
@@ -863,7 +863,8 @@ void Client::stateConnectServer1()
#ifdef SAVE_PASSWORD
LoginDialog::savedPassword = loginData.remember ?
serverConfig.getValue("password", "") : "";
- loginData.password = settings.options.password = LoginDialog::savedPassword;
+ loginData.password = LoginDialog::savedPassword;
+ settings.options.password = LoginDialog::savedPassword;
#endif
settings.login = loginData.username;
WindowManager::updateTitle();