projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'nikitakit_ducks'
[synfig.git]
/
synfig-studio
/
src
/
gtkmm
/
state_fill.cpp
diff --git
a/synfig-studio/src/gtkmm/state_fill.cpp
b/synfig-studio/src/gtkmm/state_fill.cpp
index
60c929a
..
f4df2ba
100644
(file)
--- a/
synfig-studio/src/gtkmm/state_fill.cpp
+++ b/
synfig-studio/src/gtkmm/state_fill.cpp
@@
-30,6
+30,7
@@
#endif
#include "state_fill.h"
#endif
#include "state_fill.h"
+#include "state_normal.h"
#include "workarea.h"
#include <synfig/context.h>
#include "app.h"
#include "workarea.h"
#include <synfig/context.h>
#include "app.h"
@@
-121,7
+122,9
@@
Smach::event_result
StateFill_Context::event_stop_handler(const Smach::event& /*x*/)
{
synfig::info("STATE FILL: Received Stop Event");
StateFill_Context::event_stop_handler(const Smach::event& /*x*/)
{
synfig::info("STATE FILL: Received Stop Event");
- throw Smach::egress_exception();
+ //throw Smach::egress_exception();
+ throw &state_normal;
+ return Smach::RESULT_OK;
// canvas_view->get_smach().pop_state();
// return Smach::RESULT_ACCEPT;
}
// canvas_view->get_smach().pop_state();
// return Smach::RESULT_ACCEPT;
}