projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make stdout quieter.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
canvasview.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index
93381d4
..
718a90b
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@
-796,6
+796,13
@@
CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
int h=get_canvas()->rend_desc().get_h()+70;
while(w>700 || h>600)
{
int h=get_canvas()->rend_desc().get_h()+70;
while(w>700 || h>600)
{
+ // Minor hack:
+ // zoom_out() =>
+ // WorkArea::async_update_preview() =>
+ // WorkArea::set_zoom(float) =>
+ // WorkArea::async_update_preview() =>
+ // desc.set_time(cur_time), where cur_time isn't initialised
+ work_area->set_time(0);
work_area->zoom_out();
w=round_to_int(get_canvas()->rend_desc().get_w()*work_area->get_zoom()+70);
h=round_to_int(get_canvas()->rend_desc().get_h()*work_area->get_zoom()+70);
work_area->zoom_out();
w=round_to_int(get_canvas()->rend_desc().get_w()*work_area->get_zoom()+70);
h=round_to_int(get_canvas()->rend_desc().get_h()*work_area->get_zoom()+70);
@@
-905,6
+912,10
@@
CanvasView::~CanvasView()
hide();
hide();
+ // don't be calling on_dirty_preview once this object has been deleted;
+ // this was causing a crash before
+ canvas_interface()->signal_dirty_preview().clear();
+
synfig::info("CanvasView:~CanvasView(): Destructor Finished");
}
synfig::info("CanvasView:~CanvasView(): Destructor Finished");
}