fix crash during first-run configuration of the application, caused by using an incom...

diff --git a/libs/ardour/ardour/transport_master_manager.h b/libs/ardour/ardour/transport_master_manager.h
index 46d195bf244fc8ea814eab60883eacf1050c4b6e..5ed3855eb2200ceafb50d44b7f2452ac6ac43c56 100644 (file)
--- a/libs/ardour/ardour/transport_master_manager.h
+++ b/libs/ardour/ardour/transport_master_manager.h
@@ -38,6 +38,7 @@ class LIBARDOUR_API TransportMasterManager : public boost::noncopyable
        int init ();
 
        static TransportMasterManager& instance();
+       static bool exists() { return _instance != 0; }
 
        typedef std::list<boost::shared_ptr<TransportMaster> > TransportMasters;
 

diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index c558be8b084b69fd57e1a39b7411b6707678a9ec..3227a644dde5c10f80c48416a43264668c1e5865 100644 (file)
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -189,7 +189,10 @@ RCConfiguration::get_state ()
        }
 
        root->add_child_nocopy (ControlProtocolManager::instance().get_state());
-       root->add_child_nocopy (TransportMasterManager::instance().get_state());
+
+       if (TransportMasterManager::exists()) {
+               root->add_child_nocopy (TransportMasterManager::instance().get_state());
+       }
 
        return *root;
 }

diff --git a/libs/ardour/transport_master_manager.cc b/libs/ardour/transport_master_manager.cc
index 063224632c2dc8d3740b239ed04570770a8ca01f..6354dff05ce3c53d7a207c11218cc7e9ce64f7cd 100644 (file)
--- a/libs/ardour/transport_master_manager.cc
+++ b/libs/ardour/transport_master_manager.cc
@@ -522,7 +522,9 @@ TransportMasterManager::get_state ()
 {
        XMLNode* node = new XMLNode (state_node_name);
 
-       node->set_property (X_("current"), _current_master->name());
+       if (_current_master) {
+               node->set_property (X_("current"), _current_master->name());
+       }
 
        Glib::Threads::RWLock::ReaderLock lm (lock);