summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-01-15 12:22:09 +0300
committerAndrei Karas <akaras@inbox.ru>2014-01-15 12:22:09 +0300
commit2971fb33f5a31d3e2400e1637e16216e4c4a1a1c (patch)
tree2de8b84c8a5c3b40fa7608d8125b962cf18311bd /src
parent1c9df7b5139f80a85333f9ab88a9500381be1690 (diff)
downloadmv-2971fb33f5a31d3e2400e1637e16216e4c4a1a1c.tar.gz
mv-2971fb33f5a31d3e2400e1637e16216e4c4a1a1c.tar.bz2
mv-2971fb33f5a31d3e2400e1637e16216e4c4a1a1c.tar.xz
mv-2971fb33f5a31d3e2400e1637e16216e4c4a1a1c.zip
reload background image if reconnecting to other server.
Diffstat (limited to 'src')
-rw-r--r--src/client.cpp6
-rw-r--r--src/client.h2
-rw-r--r--src/gui/windows/serverdialog.cpp3
3 files changed, 11 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 133be841f..289b4df0b 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -3033,6 +3033,12 @@ bool Client::isKeyboardVisible() const
#endif
}
+void Client::reloadWallpaper()
+{
+ if (mDesktop)
+ mDesktop->reloadWallpaper();
+}
+
#ifdef ANDROID
#ifdef USE_SDL2
void Client::extractAssets()
diff --git a/src/client.h b/src/client.h
index b89996e26..c166b438b 100644
--- a/src/client.h
+++ b/src/client.h
@@ -321,6 +321,8 @@ public:
void updateScreenKeyboard(const int height)
{ mKeyboardHeight = height; }
+ void reloadWallpaper();
+
Window *openErrorDialog(const std::string &header,
const std::string &message,
const bool modal);
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 971f3c5a5..2a1ec8314 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -394,7 +394,10 @@ void ServerDialog::connectToSelectedServer()
if (!LoginDialog::savedPasswordKey.empty())
{
if (mServerInfo->hostname != LoginDialog::savedPasswordKey)
+ {
LoginDialog::savedPassword.clear();
+ client->reloadWallpaper();
+ }
}
config.setValue("usePersistentIP",