summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2009-01-09 20:35:42 -0700
committerIra Rice <irarice@gmail.com>2009-01-09 20:35:42 -0700
commit43630ab7969fa26cb0a3e2773e7266f2f9647867 (patch)
tree83917d40c9d5e5d868f21fccd212110bf9b426aa
parentc7a2b7f6bcc5deca46e1f01486b359380eb73e75 (diff)
downloadmana-43630ab7969fa26cb0a3e2773e7266f2f9647867.tar.gz
mana-43630ab7969fa26cb0a3e2773e7266f2f9647867.tar.bz2
mana-43630ab7969fa26cb0a3e2773e7266f2f9647867.tar.xz
mana-43630ab7969fa26cb0a3e2773e7266f2f9647867.zip
Fixed color setup dialog (which was uninitialized in older commits when
the setup button was created ) Signed-off-by: Ira Rice <irarice@gmail.com>
-rw-r--r--src/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index efb14deb..5f508c52 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -734,6 +734,9 @@ int main(int argc, char *argv[])
unsigned int oldstate = !state; // We start with a status change.
+ // Needs to be created in main, as the updater uses it
+ textColour = new Colour();
+
Game *game = NULL;
Window *currentDialog = NULL;
Image *login_wallpaper = NULL;
@@ -794,9 +797,6 @@ int main(int argc, char *argv[])
if (!login_wallpaper)
logger->log(_("Couldn't load %s as wallpaper"), wallpaperName.c_str());
- // Needs to be created in main, as the updater uses it
- textColour = new Colour();
-
while (state != EXIT_STATE)
{
// Handle SDL events