Fix: Avoid an incorrect and too early bail out

bareos · Jan 26, 2018 · 71b0a51 · 71b0a51
1 parent 2c34a60
commit 71b0a51
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/module/Restore/src/Restore/Model/RestoreModel.php b/module/Restore/src/Restore/Model/RestoreModel.php
@@ -56,11 +56,7 @@ public function getDirectories(&$bsock=null, $jobid=null, $pathid=null) {
             $result = $bsock->send_command($cmd_1, 2, $jobid);
             $directories = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
 
-            if ( empty($directories['result']) ) {
-               return $retval;
-            }
-
-            if(empty($directories['result']['directories'])) {
+            if(empty($directories['result'])) {
                $cmd_2 = '.bvfs_lsdirs jobid='.$jobid.' path=@ limit='.$limit;
                $result = $bsock->send_command($cmd_2, 2, $jobid);
                $directories = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);