From 4ea05d37c952b80105a5623865c3dfec35a1bfd5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 May 2020 03:55:29 +0300 Subject: Fix left style issues from switch port merging --- src/progs/manaplus/actions/actions.cpp | 3 ++- src/progs/manaplus/client.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/progs') 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(); -- cgit v1.2.3-70-g09d2