Merge branch 'master' of feistymeow.org:feisty_meow

Conflicts:
	nucleus/library/filesystem/heavy_file_ops.cpp

diff --cc nucleus/library/filesystem/heavy_file_ops.cpp
index d6ff4184da0c756df29a9f1e4df86e0f5b9d2f91,0d2f91bc3463383ffcc1d0285597886af0abac03..6f5b19db1832feffb4e815c3df9c05069745a541
--- 1/nucleus/library/filesystem/heavy_file_ops.cpp
--- 2/nucleus/library/filesystem/heavy_file_ops.cpp
+++ b/nucleus/library/filesystem/heavy_file_ops.cpp
@@@ -280,9 -279,8 +280,8 @@@ LOG(astring("skipping bad file: ") + fu
        continue;
      }
  
-     if ((last_action._byte_start + last_action._length >= current.length())
-         && current.length()) {
- //LOG(astring("finished handling file: ") + full_file);
+     if (last_action._byte_start + last_action._length >= current.length()) {
 -//        && current.length()) {
++LOG(astring("finished handling file: ") + full_file);
        // this file is done now.  go to the next one.
        if (!advance(to_transfer, last_action)) break;
        continue;