Fix race condition with a std::string access

The downloading thread was writing to a std::string while the main
thread was trying to draw it, for example. Now access to the label
caption is guarded with a mutex.

Should fix crashes while downloading updates.

1 files changed, 10 insertions, 3 deletions

diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 4c302e85..9cd3405e 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -31,12 +31,13 @@
 
 #include "../guichanfwd.h"
 
+#include "../utils/mutex.h"
+
 class BrowserBox;
 class Button;
 class ProgressBar;
 class ScrollArea;
 
-struct SDL_mutex;
 struct SDL_Thread;
 
 /**
@@ -89,7 +90,7 @@ class UpdaterWindow : public Window, public gcn::ActionListener
 
     int updateState;
 
- protected:
+private:
     void download();
 
     /**
@@ -134,6 +135,12 @@ class UpdaterWindow : public Window, public gcn::ActionListener
     /** The file currently downloading. */
     std::string mCurrentFile;
 
+    /** The new label caption to be set in the logic method. */
+    std::string mNewLabelCaption;
+
+    /** The mutex used to guard access to mNewLabelCaption. */
+    Mutex mLabelMutex;
+
     /** The Adler32 checksum of the file currently downloading. */
     unsigned long mCurrentChecksum;
 
@@ -165,7 +172,7 @@ class UpdaterWindow : public Window, public gcn::ActionListener
     Button *mCancelButton;        /**< Button to stop the update process. */
     Button *mPlayButton;          /**< Button to start playing. */
     ProgressBar *mProgressBar;    /**< Update progress bar. */
-    BrowserBox* mBrowserBox;      /**< Box to display news. */
+    BrowserBox *mBrowserBox;      /**< Box to display news. */
     ScrollArea *mScrollArea;      /**< Used to scroll news box. */
 };