[gnash] Add the patch to git repo
Hicham HAOUARI
hicham at fedoraproject.org
Sat Apr 9 20:21:58 UTC 2011
commit 2f2ebe8f43149309bb26d088a73d848c61ecdb75
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date: Sat Apr 9 21:21:32 2011 +0100
Add the patch to git repo
...oy-movieroot-before-clearing-moviefactory.patch | 29 ++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/gnash-0.8.9-destroy-movieroot-before-clearing-moviefactory.patch b/gnash-0.8.9-destroy-movieroot-before-clearing-moviefactory.patch
new file mode 100644
index 0000000..e1801e8
--- /dev/null
+++ b/gnash-0.8.9-destroy-movieroot-before-clearing-moviefactory.patch
@@ -0,0 +1,29 @@
+X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=gnash.git;a=blobdiff_plain;f=gui%2FPlayer.cpp;h=193dc861d0ffbb8b48e651b5d9d61c50a38da44a;hp=736fcceec0dc8519756468924f18900437375855;hb=3d603f00aa4be917fb6e43f2e265de885127f441;hpb=9794bea6121872eba958d25961bd10c5b901e0ba
+
+diff --git a/gui/Player.cpp b/gui/Player.cpp
+index 736fcce..193dc86 100644
+--- a/gui/Player.cpp
++++ b/gui/Player.cpp
+@@ -491,6 +491,9 @@ Player::run(int argc, char* argv[], const std::string& infile,
+ // Now that we know about movie size, create gui window.
+ _gui->createWindow(_url.c_str(), _width, _height, _xPosition, _yPosition);
+
++ { // we construct movie_root in its own scope, to be sure it's destroyed
++ // (bringing down the MovieLoader) before we clear the MovieLibrary
++
+ movie_root root(_gui->getClock(), *_runResources);
+
+ _callbacksHandler.reset(new CallbacksHandler(*_gui, *this));
+@@ -644,7 +647,10 @@ Player::run(int argc, char* argv[], const std::string& infile,
+
+ log_debug("Main loop ended, cleaning up");
+
+- // Clean up as much as possible, so valgrind will help find actual leaks.
++ }
++
++ // Clean up the MovieLibrary so left-over SWFMovieDefinitions
++ // get destroyed and join any loader thread
+ MovieFactory::clear();
+
+ }
+
More information about the scm-commits
mailing list