aboutsummaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-01-13 09:23:42 +0000
committerDavid Robillard <d@drobilla.net>2013-01-13 09:23:42 +0000
commit448d6e329a55848e357d57f8ca225d987627ee08 (patch)
tree0153d22bedf929173b973b98c6840fd010b06aca /src/gui
parent67a8adbc93991acfb688f378f52392995a272fac (diff)
downloadmachina-448d6e329a55848e357d57f8ca225d987627ee08.tar.gz
machina-448d6e329a55848e357d57f8ca225d987627ee08.tar.bz2
machina-448d6e329a55848e357d57f8ca225d987627ee08.zip
Move merge operation to Machine::merge().
Delete unused Engine::import_machine(). git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4956 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/MachinaGUI.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp
index f95eec2..beb7b3a 100644
--- a/src/gui/MachinaGUI.cpp
+++ b/src/gui/MachinaGUI.cpp
@@ -543,6 +543,7 @@ MachinaGUI::menu_import_midi()
dialog.hide();
machine->reset(NULL, machine->time());
_engine->driver()->set_machine(machine);
+ _canvas->clear();
rebuild_canvas();
} else {
Gtk::MessageDialog msg_dialog(dialog, "Error loading MIDI file",