projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidying.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
preview.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/preview.cpp
b/synfig-studio/trunk/src/gtkmm/preview.cpp
index
f0d56e1
..
78f8749
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/preview.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/preview.cpp
@@
-256,7
+256,7
@@
void studio::Preview::frame_finish(const Preview_Target *targ)
if(!buffer)
return;
if(!buffer)
return;
- //convert all the pix
le
s to the pixbuf... buffer... thing...
+ //convert all the pix
el
s to the pixbuf... buffer... thing...
//synfig::warning("Converting...");
convert_color_format(buffer, surf[0], surf.get_w()*surf.get_h(), pf, App::gamma);
//synfig::warning("Converting...");
convert_color_format(buffer, surf[0], surf.get_w()*surf.get_h(), pf, App::gamma);
@@
-858,10
+858,15
@@
void studio::Widget_Preview::repreview()
void studio::Widget_Preview::stoprender()
{
void studio::Widget_Preview::stoprender()
{
+ // don't crash if the render has already been stopped
+ if (!preview->renderer)
+ return;
+
if(preview)
if(preview)
- {
- preview->renderer.detach();
- }
+ if (preview->renderer->updating)
+ preview->renderer->stop();
+ else
+ preview->renderer.detach();
}
void studio::Widget_Preview::eraseall()
}
void studio::Widget_Preview::eraseall()