CC-2882: Airtime cannot delete watched folder when is been renamed
- done
This commit is contained in:
parent
b1fa8901ca
commit
d1542b0d89
3 changed files with 25 additions and 33 deletions
|
@ -542,6 +542,7 @@ class ApiController extends Zend_Controller_Action
|
|||
foreach($files as $file){
|
||||
$file->delete();
|
||||
}
|
||||
return;
|
||||
}
|
||||
$this->view->id = $file->getId();
|
||||
}
|
||||
|
|
|
@ -284,10 +284,6 @@ class Application_Model_MusicDir {
|
|||
$real_path = realpath($p_dir)."/";
|
||||
if($real_path != "/"){
|
||||
$p_dir = $real_path;
|
||||
}else{
|
||||
// this is the case where user removes watched directory on
|
||||
// the file system directly.
|
||||
$p_dir .= "/";
|
||||
}
|
||||
$dir = Application_Model_MusicDir::getDirByPath($p_dir);
|
||||
if($dir == NULL){
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue