From b9331fca5a0472890c388175f23c6c7f70ab8d7f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 19 Feb 2011 00:30:19 +0200
Subject: Fix race condition in guichan bugfix.

---
 src/gui/gui.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/gui/gui.cpp')

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 984b9ea1a..937a102f7 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -27,6 +27,7 @@
 #include "gui/theme.h"
 #include "gui/truetypefont.h"
 
+#include "gui/widgets/mouseevent.h"
 #include "gui/widgets/window.h"
 #include "gui/widgets/windowcontainer.h"
 
@@ -331,6 +332,10 @@ void Gui::distributeMouseEvent(gcn::Widget* source, int type, int button,
         return;
     }
 
+    MouseEvent mouseEvent(source, mShiftPressed, mControlPressed,
+        mAltPressed, mMetaPressed, type, button,
+        x, y, mClickCount);
+
     while (parent != NULL)
     {
         // If the widget has been removed due to input
@@ -340,14 +345,14 @@ void Gui::distributeMouseEvent(gcn::Widget* source, int type, int button,
 
         parent = (gcn::Widget*)widget->getParent();
 
+
         if (widget->isEnabled() || force)
         {
             int widgetX, widgetY;
             widget->getAbsolutePosition(widgetX, widgetY);
 
-            gcn::MouseEvent mouseEvent(source, mShiftPressed, mControlPressed,
-                mAltPressed, mMetaPressed, type, button,
-                x - widgetX, y - widgetY, mClickCount);
+            mouseEvent.setX(x - widgetX);
+            mouseEvent.setY(y - widgetY);
 
             std::list<gcn::MouseListener*> mouseListeners
                 = widget->_getMouseListeners();
-- 
cgit v1.2.3-70-g09d2