some improvements in file scanning

diff --git a/files/ajax/scan.php b/files/ajax/scan.php
index f7e75d5f8ba883535e26135dfb1ef03331aaf7c6..565275911b4e1591cefc8ff6b4f2664479c935b5 100644 (file)
--- a/files/ajax/scan.php
+++ b/files/ajax/scan.php
@@ -15,13 +15,19 @@ if(!$checkOnly){
 //create the file cache if necesary
 if($force or !OC_FileCache::inCache('')){
        if(!$checkOnly){
-               OC_FileCache::scan('',false,$eventSource);
+               OC_DB::beginTransaction();
+               OC_FileCache::scan('',$eventSource);
+               OC_DB::commit();
                $eventSource->send('success',true);
        }else{
                OC_JSON::success(array('data'=>array('done'=>true)));
                exit;
        }
 }else{
+       if($checkOnly){
+               OC_JSON::success(array('data'=>array('done'=>false)));
+               exit;
+       }
        if(isset($eventSource)){
                $eventSource->send('success',false);
        }else{