diff -rupN library.orig/P4/ClientPool/ClientPool.php library/P4/ClientPool/ClientPool.php --- library.orig/P4/ClientPool/ClientPool.php 2016-07-27 09:34:48.000000000 +0000 +++ library/P4/ClientPool/ClientPool.php 2016-07-27 09:36:23.000000000 +0000 @@ -281,6 +281,9 @@ class ClientPool extends ConnectedAbstra } } + // clear files if needed + if ($clearFiles) { $this->clearFiles($p4); } + // force the client to have current/correct settings $data = $p4->run('client', array('-o', $client))->expandSequences()->getData(-1); $p4->run( @@ -297,8 +300,7 @@ class ClientPool extends ConnectedAbstra // ensure the root folder and lock file exist is_dir($root) ?: mkdir($root); - // clear files if needed and return - return $clearFiles ? $this->clearFiles($p4) : $this; + return $this; } /**