summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-11-02 21:46:36 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-11-02 21:46:36 +0000
commit46308b7e9d65dd734664f903a09c3210f1684a6c (patch)
tree40624fd5d6d4c33fc078e64d00d16db56b485db4 /src/main.cpp
parent19e15c87a1fc74f71fd6f9a743201a24ac582997 (diff)
downloadMana-46308b7e9d65dd734664f903a09c3210f1684a6c.tar.gz
Mana-46308b7e9d65dd734664f903a09c3210f1684a6c.tar.bz2
Mana-46308b7e9d65dd734664f903a09c3210f1684a6c.tar.xz
Mana-46308b7e9d65dd734664f903a09c3210f1684a6c.zip
Merged trunk changes from revision 2757 to 2800 into the 0.1.0 branch.
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 0ae328ea..ea2b7829 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -643,6 +643,10 @@ int main(int argc, char *argv[])
if (oldstate == STATE_UPDATE)
{
loadUpdates();
+ // Reload the wallpaper in case that it was updated
+ login_wallpaper->decRef();
+ login_wallpaper = ResourceManager::getInstance()->
+ getImage("graphics/images/login_wallpaper.png");
}
oldstate = state;