diff options
| author | Noel Grandin <noel@peralex.com> | 2016-03-02 16:28:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-03-02 16:39:13 +0200 |
| commit | 037de512546917786c313d23995daaa0521a8e6e (patch) | |
| tree | 7bff7e3ad727708b6f44adc0753440c6f7813c6c /slideshow/source/engine/transitions | |
| parent | cdd7a0fe48aefee420d1f75b9dff04a26362773a (diff) | |
tdf#98175 fix Impress crash
Caused by my commit f29c0b2b3e8861909fa2c6c37bf631ab01590541
"boost::shared_ptr->std::shared_ptr in slideshow"
where I foolishly converted
shared_from_this()
to
std::shared_ptr<Activity>((Activity*)this) )
all over the place, which is bad, I should have used
std::dynamic_pointer_cast<ViewEventHandler>(shared_from_this())
Ah, the joys of C++ memory management.
Change-Id: I9b538e78730c9107870f406cb8ba482d491dd568
Diffstat (limited to 'slideshow/source/engine/transitions')
| -rw-r--r-- | slideshow/source/engine/transitions/slidechangebase.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index e5a24e8450a2..a13dd27be25f 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -176,7 +176,7 @@ void SlideChangeBase::prefetch( const AnimatableShapeSharedPtr&, return; // register ourselves for view change events - mrEventMultiplexer.addViewHandler( std::shared_ptr<ViewEventHandler>(this) ); + mrEventMultiplexer.addViewHandler( std::dynamic_pointer_cast<ViewEventHandler>(shared_from_this()) ); // init views and create slide bitmaps for( const auto& pView : mrViewContainer ) @@ -251,7 +251,7 @@ void SlideChangeBase::end() mbSpritesVisible = false; // remove also from event multiplexer, we're dead anyway - mrEventMultiplexer.removeViewHandler( std::shared_ptr<ViewEventHandler>(this) ); + mrEventMultiplexer.removeViewHandler( std::dynamic_pointer_cast<ViewEventHandler>(shared_from_this()) ); } bool SlideChangeBase::operator()( double nValue ) |