Tempo ramps - audio-locked meters have a bbt of 1|1|0

[ardour.git] / libs / pbd / file_utils.cc

diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc
index 26a33db15918ef223ba3765f633ba00e118df538..6cf43f3fd2bfd3324895151c4b8bc4a274246b4d 100644 (file)
--- a/libs/pbd/file_utils.cc
+++ b/libs/pbd/file_utils.cc
@@ -22,7 +22,7 @@
 #include <vector>
 
 #include <glib.h>
-#include <pbd/gstdio_compat.h>
+#include "pbd/gstdio_compat.h"
 
 #ifdef COMPILER_MINGW
 #include <io.h> // For W_OK
@@ -440,29 +440,31 @@ remove_directory_internal (const string& dir, size_t* size, vector<string>* path
        get_paths (tmp_paths, dir, just_remove_files, true);
 
        for (vector<string>::const_iterator i = tmp_paths.begin();
-            i != tmp_paths.end(); ++i) {
+                       i != tmp_paths.end(); ++i) {
 
-                if (g_stat (i->c_str(), &statbuf)) {
+               if (g_stat (i->c_str(), &statbuf)) {
                        continue;
                }
 
-                if (::g_remove (i->c_str())) {
-                        error << string_compose (_("cannot remove path %1 (%2)"), *i, strerror (errno))
-                              << endmsg;
-                        ret = 1;
-                }
+               if (::g_remove (i->c_str())) {
+                       error << string_compose (_("cannot remove path %1 (%2)"), *i, strerror (errno))
+                               << endmsg;
+                       ret = 1;
+                       continue;
+               }
 
-                if (paths) {
-                        paths->push_back (Glib::path_get_basename(*i));
-                }
+               if (paths) {
+                       paths->push_back (Glib::path_get_basename(*i));
+               }
 
-                if (size) {
-                        *size += statbuf.st_size;
-                }
+               // statbuf.st_size is off_t
+               if (size && statbuf.st_size > 0) {
+                       *size += statbuf.st_size;
+               }
 
        }
 
-        return ret;
+       return ret;
 }
 
 int