add string_compose argument specializations so that empty std::string and empty C...

[ardour.git] / libs / ardour / audio_playlist_importer.cc

diff --git a/libs/ardour/audio_playlist_importer.cc b/libs/ardour/audio_playlist_importer.cc
index 681f563e688193aa8de5497eb41adc96012f7b72..08cd090cdb865a9c529b9c1943ef2309209ad705 100644 (file)
--- a/libs/ardour/audio_playlist_importer.cc
+++ b/libs/ardour/audio_playlist_importer.cc
@@ -28,7 +28,6 @@
 
 #include "ardour/audio_region_importer.h"
 #include "ardour/session.h"
-#include "ardour/playlist.h"
 #include "ardour/playlist_factory.h"
 #include "ardour/session_playlists.h"
 
@@ -178,7 +177,14 @@ AudioPlaylistImporter::_prepare_move ()
                }
                name = rename_pair.second;
        }
-       xml_playlist.property ("name")->set_value (name);
+       
+       XMLProperty* p = xml_playlist.property ("name");
+       if (!p) {
+               error << _("badly-formed XML in imported playlist") << endmsg;
+               return false;
+       }
+
+       p->set_value (name);
        handler.add_name (name);
 
        return true;
@@ -217,6 +223,7 @@ AudioPlaylistImporter::_move ()
                XMLProperty* out = (*it)->property("out");
                if (!in || !out) {
                        error << string_compose (X_("AudioPlaylistImporter (%1): did not find the \"in\" or \"out\" property from a crossfade"), name) << endmsg;
+                       continue; // or fatal?
                }
 
                handler.update_region_id (in);