ardour/livetrax
13
0
Fork 0
Code

fixes for possible null engine dialog

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4993 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-04-20 21:00:30 +00:00
parent 0513474072
commit f19c01bbb4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/ardour_ui.cc
View File

@ -526,8 +526,8 @@ ARDOUR_UI::save_ardour_state ()
XMLNode* node = new XMLNode (keyboard->get_state());
Config->add_extra_xml (*node);
Config->add_extra_xml (get_transport_controllable_state());
if (_startup && _startup->engine_control().was_used()) {
Config->add_extra_xml (_startup->engine_control().get_state());
if (_startup && _startup->engine_control() && _startup->engine_control()->was_used()) {
Config->add_extra_xml (_startup->engine_control()->get_state());
}
Config->save_state();
ui_config->save_state ();
@ -649,8 +649,8 @@ ARDOUR_UI::startup ()
bool backend_audio_is_running = EngineControl::engine_running();
XMLNode* audio_setup = Config->extra_xml ("AudioSetup");
if (audio_setup) {
_startup->engine_control().set_state (*audio_setup);
if (audio_setup && _startup && _startup->engine_control()) {
_startup->engine_control()->set_state (*audio_setup);
}
if (!get_session_parameters (backend_audio_is_running, ARDOUR_COMMAND_LINE::new_session)) {

2
gtk2_ardour/startup.h
View File

@ -31,7 +31,7 @@ class ArdourStartup : public Gtk::Assistant {
bool use_session_template() { return false; }
Glib::ustring session_template_name() { return ""; }
EngineControl& engine_control() { return *engine_dialog; }
EngineControl* engine_control() { return engine_dialog; }
// advanced session options