summaryrefslogtreecommitdiff
path: root/src/gui/updatewindow.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-06-04 21:48:47 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-06-04 21:48:47 +0000
commita353543dd4da3c489a84f6f17125fdd0e1be2349 (patch)
tree5e447a0f9a3fd50f58a48f39bbb77d392d78af36 /src/gui/updatewindow.cpp
parentab072dddb231895ba7b6762eda9fa70af961b0fb (diff)
downloadmana-client-a353543dd4da3c489a84f6f17125fdd0e1be2349.tar.gz
mana-client-a353543dd4da3c489a84f6f17125fdd0e1be2349.tar.bz2
mana-client-a353543dd4da3c489a84f6f17125fdd0e1be2349.tar.xz
mana-client-a353543dd4da3c489a84f6f17125fdd0e1be2349.zip
Merged 0.0 changes from revision 3234 to 3317 to trunk.
Diffstat (limited to 'src/gui/updatewindow.cpp')
-rw-r--r--src/gui/updatewindow.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index d8130cd3..ed75e5b3 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -157,6 +157,7 @@ void UpdaterWindow::setLabel(const std::string &str)
void UpdaterWindow::enable()
{
+ mCancelButton->setEnabled(false);
mPlayButton->setEnabled(true);
mPlayButton->requestFocus();
}
@@ -168,11 +169,7 @@ void UpdaterWindow::action(const gcn::ActionEvent &event)
// Register the user cancel
mUserCancel = true;
// Skip the updating process
- if (mDownloadStatus == UPDATE_COMPLETE)
- {
- state = STATE_EXIT;
- }
- else
+ if (mDownloadStatus != UPDATE_COMPLETE)
{
mDownloadStatus = UPDATE_ERROR;
}