[Gnash-commit] [SCM] Gnash branch, master, updated. bbb94d9f85363cf158acf358efbc86a502503b23

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  bbb94d9f85363cf158acf358efbc86a502503b23 (commit)
      from  2a2077e07868200fd69576cbe7cb83a276249fd5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=bbb94d9f85363cf158acf358efbc86a502503b23


commit bbb94d9f85363cf158acf358efbc86a502503b23
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Oct 8 21:38:44 2010 +0200

    Fix button cleanup segfault.

diff --git a/libcore/movie_root.h b/libcore/movie_root.h
index b433741..b70b9e3 100644
--- a/libcore/movie_root.h
+++ b/libcore/movie_root.h
@@ -1012,6 +1012,16 @@ private:
 
     void handleActionLimitHit(const std::string& ref);
 
+    /// Buttons listening for key events
+    //
+    /// Note that Buttons (the only key listeners left) deregister themselves
+    /// on destruction. This isn't correct behaviour and also requires that
+    /// _keyListeners be alive longer than _gc so that deregistration doesn't
+    /// access a destroyed object.
+    //
+    /// TODO: fix it.
+    Listeners _keyListeners;
+
     GC _gc;
 
     const RunResources& _runResources; 
@@ -1075,9 +1085,6 @@ private:
 
     key::code _lastKeyEvent;
 
-    /// Characters for listening key events
-    Listeners _keyListeners;
-
     /// The DisplayObject currently holding focus, or 0 if no focus.
     DisplayObject* _currentFocus;
 

-----------------------------------------------------------------------

Summary of changes:
 libcore/movie_root.h |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash