[gnash] Rebase patch

Hicham HAOUARI hicham at fedoraproject.org
Sat Apr 9 20:50:52 UTC 2011


commit c3905927388ce2c0276c7654869bb0a8944183ec
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Sat Apr 9 21:49:57 2011 +0100

    Rebase patch

 ...oy-movieroot-before-clearing-moviefactory.patch |    6 +++---
 1 files changed, 3 insertions(+), 3 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
index e1801e8..b382a9e 100644
--- a/gnash-0.8.9-destroy-movieroot-before-clearing-moviefactory.patch
+++ b/gnash-0.8.9-destroy-movieroot-before-clearing-moviefactory.patch
@@ -4,17 +4,17 @@ 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,
+@@ -496,6 +496,9 @@ Player::run(int argc, char* argv[], cons
      // 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);
+     movie_root root(*_movieDef, _gui->getClock(), *_runResources);
      
      _callbacksHandler.reset(new CallbacksHandler(*_gui, *this)); 
-@@ -644,7 +647,10 @@ Player::run(int argc, char* argv[], const std::string& infile,
+@@ -649,7 +652,10 @@ Player::run(int argc, char* argv[], cons
  
      log_debug("Main loop ended, cleaning up");
  


More information about the scm-commits mailing list