diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-11-13 09:27:53 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-11-13 09:27:53 +0100 |
| commit | 477961678194817aaf1aaf3602f1c91d288a539d (patch) | |
| tree | d66356753053a34f93b4f6059631e0f6c4eb298c /nxcomp/Channel.cpp | |
| parent | 799bf672a3588f205bd18ef39d9908069e0cd6d5 (diff) | |
| download | nx-libs-477961678194817aaf1aaf3602f1c91d288a539d.tar.gz nx-libs-477961678194817aaf1aaf3602f1c91d288a539d.tar.bz2 nx-libs-477961678194817aaf1aaf3602f1c91d288a539d.zip | |
Imported nxcomp-3.4.0-6.tar.gznxcomp/3.4.0-6
Summary: Imported nxcomp-3.4.0-6.tar.gz
Keywords:
Imported nxcomp-3.4.0-6.tar.gz
into Git repository
Diffstat (limited to 'nxcomp/Channel.cpp')
| -rw-r--r-- | nxcomp/Channel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nxcomp/Channel.cpp b/nxcomp/Channel.cpp index 47506302e..71b556b0d 100644 --- a/nxcomp/Channel.cpp +++ b/nxcomp/Channel.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -2037,10 +2037,10 @@ Split *Channel::handleSplitCommitRemove(int request, int resource, int position) << ".\n" << logofs_flush; #endif - if (control -> isProtoStep7() == 1 && + if ((control -> isProtoStep7() == 1 && (resource != split -> getResource() || request != split -> getRequest() || - position != split -> getPosition()) || + position != split -> getPosition())) || (request != split -> getRequest() || position != split -> getPosition())) { |