diff options
Diffstat (limited to 'src/gui/ThreadedLoader.cpp')
| -rw-r--r-- | src/gui/ThreadedLoader.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index 93cccdf1..6e57c383 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -49,15 +49,10 @@ ThreadedLoader::~ThreadedLoader() _thread.join(); } -SPtr<Serialisation::Parser> +SPtr<Parser> ThreadedLoader::parser() { - Ingen::World* world = _app.world(); - - if (!world->parser()) - world->load_module("serialisation"); - - return world->parser(); + return _app.world()->parser(); } void @@ -95,7 +90,7 @@ ThreadedLoader::load_graph(bool merge, _events.push_back( sigc::hide_return( sigc::bind(sigc::mem_fun(world->parser().get(), - &Ingen::Serialisation::Parser::parse_file), + &Ingen::Parser::parse_file), _app.world(), _app.world()->interface().get(), document_uri, |