fix crash when using track templates caused by a recent change to the filescanner...
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 6 Apr 2013 15:21:09 +0000 (11:21 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 6 Apr 2013 15:21:09 +0000 (11:21 -0400)
libs/pbd/file_utils.cc

index 7c3dffe71ffeee1195cc3ec3a9728dd9bfbf46ac..bb290fa6aaf1ae9ccdeba64e9a3941ed734b0184 100644 (file)
@@ -18,6 +18,7 @@
 */
 
 #include <algorithm>
+#include <vector>
 
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -32,6 +33,7 @@
 #include "pbd/file_utils.h"
 #include "pbd/error.h"
 #include "pbd/pathscanner.h"
+#include "pbd/stl_delete.h"
 
 #include "i18n.h"
 
@@ -165,10 +167,14 @@ copy_files(const std::string & from_path, const std::string & to_dir)
 {
        PathScanner scanner;
        vector<string*>* files = scanner (from_path, accept_all_files, 0, true, false);
-       for (vector<string*>::iterator i = files->begin(); i != files->end(); ++i) {
-               std::string from = Glib::build_filename (from_path, **i);
-               std::string to = Glib::build_filename (to_dir, **i);
-               copy_file (from, to);
+
+       if (files) {
+               for (vector<string*>::iterator i = files->begin(); i != files->end(); ++i) {
+                       std::string from = Glib::build_filename (from_path, **i);
+                       std::string to = Glib::build_filename (to_dir, **i);
+                       copy_file (from, to);
+               }
+               vector_delete (files);
        }
 }