fix not emptying $todelete enough (on save file for example); do not abort on deletio...

diff --git a/bin/booh b/bin/booh
index 850aade3cd070297ad43590960bd36c8e1283c50..019464df81f30882eabe099f046535dca2ad527d 100644 (file)
--- a/bin/booh
+++ b/bin/booh
@@ -1891,8 +1891,13 @@ def save_current_file_user
 
     msg 3, "performing actual deletion of: " + $todelete.join(', ')
     $todelete.each { |f|
 
     msg 3, "performing actual deletion of: " + $todelete.join(', ')
     $todelete.each { |f|

-        File.delete(f)
+        begin
+            File.delete(f)
+        rescue
+            puts "Failed to delete #{f}: #{$!}"
+        end

     }
     }

+    $todelete = []

 end
 
 def mark_document_as_dirty
 end
 
 def mark_document_as_dirty


@@ -1949,7 +1954,6 @@ def ask_save_modifications(msg1, msg2, *options)
             if response == Gtk::Dialog::RESPONSE_CANCEL
                 ret = false
             end
             if response == Gtk::Dialog::RESPONSE_CANCEL
                 ret = false
             end

-            $todelete = []  #- unconditionally clear the list of images/videos to delete

         }
     end
     return ret
         }
     end
     return ret