summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/gui/updatewindow.cpp7
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d1f4e47..e12dda35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2007-03-24 Bjørn Lindeijer <bjorn@lindeijer.nl>
+2007-03-20 Philipp Sehmisch <tmw@crushnet.org>
+
+ * src/gui/updatewindow.cpp: Cancel button is now disabled after
+ downloading is finished.
+
+2007-03-24 Bjørn Lindeijer <bjorn@lindeijer.nl>
* src/main.cpp: Changed the order of network message handling and
logic, in order to prevent an incoming character delete message from
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index b66bcfbd..8e105844 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 = EXIT_STATE;
- }
- else
+ if (mDownloadStatus != UPDATE_COMPLETE)
{
mDownloadStatus = UPDATE_ERROR;
}