summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2009-10-31 14:33:01 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2009-10-31 14:38:18 +0100
commitd93c47be924815883c96d089cad5deba2bf381fc (patch)
tree8929fdeb03d25a0d84e009b61b6541fb7152616e
parent1cf4fe9d92e57693bf90148445fe6ba349ef3420 (diff)
downloadmana-d93c47be924815883c96d089cad5deba2bf381fc.tar.gz
mana-d93c47be924815883c96d089cad5deba2bf381fc.tar.bz2
mana-d93c47be924815883c96d089cad5deba2bf381fc.tar.xz
mana-d93c47be924815883c96d089cad5deba2bf381fc.zip
Fixed crash on startup
Was introduced in d5d10a30ceb4a9d6bbb19fe8cbcf878cd841cd53. In particular, the progress bar was not initialized to 0, even though it is checked for 0 later on and used if it isn't 0. Thanks to 4144 for reporting this issue.
-rw-r--r--src/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index b8dc9f9b..64021eac 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -808,9 +808,9 @@ int main(int argc, char *argv[])
setupWindow = new Setup;
gcn::Container *top = static_cast<gcn::Container*>(gui->getTop());
- Desktop *desktop;
- ProgressBar *progressBar;
- Button *setupButton;
+ Desktop *desktop = 0;
+ ProgressBar *progressBar = 0;
+ Button *setupButton = 0;
sound.playMusic(branding.getValue("loginMusic", "Magick - Real.ogg"));