summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/App.cpp7
-rw-r--r--src/gui/ThreadedLoader.cpp6
2 files changed, 9 insertions, 4 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 9c9864cb..28e72a5f 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -261,7 +261,7 @@ App::activity_port_destroyed(Port* port)
bool
App::animate()
{
- for (ActivityPorts::iterator i = _activity_ports.begin(); i != _activity_ports.end() ; ) {
+ for (ActivityPorts::iterator i = _activity_ports.begin(); i != _activity_ports.end(); ) {
ActivityPorts::iterator next = i;
++next;
@@ -300,7 +300,10 @@ App::gtk_main_iteration()
return false;
if (_world->local_engine()) {
- _world->local_engine()->main_iteration();
+ if (!_world->local_engine()->main_iteration()) {
+ Gtk::Main::quit();
+ return false;
+ }
} else {
_enable_signal = false;
_client->emit_signals();
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index 10f1f8d6..2a9646e2 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -93,7 +93,8 @@ ThreadedLoader::load_patch(bool merge,
// Filthy hack to load deprecated patches based on file extension
if (document_uri.substr(document_uri.length()-3) == ".om") {
_events.push_back(sigc::hide_return(sigc::bind(
- sigc::mem_fun(_deprecated_loader, &DeprecatedLoader::load_patch),
+ sigc::mem_fun(_deprecated_loader,
+ &DeprecatedLoader::load_patch),
document_uri,
merge,
engine_parent,
@@ -102,7 +103,8 @@ ThreadedLoader::load_patch(bool merge,
false)));
} else {
_events.push_back(sigc::hide_return(sigc::bind(
- sigc::mem_fun(world->parser().get(), &Ingen::Serialisation::Parser::parse_document),
+ sigc::mem_fun(world->parser().get(),
+ &Ingen::Serialisation::Parser::parse_file),
App::instance().world(),
App::instance().world()->engine().get(),
document_uri,