From e1169335beac83513fa806a5929fa3c89ce625bb Mon Sep 17 00:00:00 2001 From: Deon George Date: Wed, 19 Jul 2023 16:34:09 +1000 Subject: [PATCH] Fix for when NR mode is active --- app/Classes/File/Receive.php | 2 ++ app/Classes/Protocol/Binkp.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Classes/File/Receive.php b/app/Classes/File/Receive.php index 3e8388d..1f1d16e 100644 --- a/app/Classes/File/Receive.php +++ b/app/Classes/File/Receive.php @@ -56,6 +56,8 @@ class Receive extends Base case 'fd': return is_resource($this->f); + case 'recvmtime': + case 'recvsize': case 'mtime': case 'nameas': case 'size': diff --git a/app/Classes/Protocol/Binkp.php b/app/Classes/Protocol/Binkp.php index 9481b75..23f6795 100644 --- a/app/Classes/Protocol/Binkp.php +++ b/app/Classes/Protocol/Binkp.php @@ -874,8 +874,8 @@ final class Binkp extends BaseProtocol if ($this->recv->ready && $this->recv->nameas && (! strncasecmp(Arr::get($file,'file.name'),$this->recv->nameas,self::MAX_PATH)) - && $this->recv->mtime === Arr::get($file,'file.mtime') - && $this->recv->size === Arr::get($file,'file.size') + && $this->recv->recvmtime === Arr::get($file,'file.mtime') + && $this->recv->recvsize === Arr::get($file,'file.size') && $this->recv->pos === $file['offs']) { $this->recv->open($file['offs']<0,$file['flags']);