From bf2f224eb9aa12f9df37b2df2c57ca1ed3c752b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Mon, 10 Oct 2016 16:47:05 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@279 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src/console/piterminal.cpp | 2 +- src/thread/pipipelinethread.h | 10 ++++++---- utils/system_daemon/daemon.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/console/piterminal.cpp b/src/console/piterminal.cpp index d09d59f0..e040b309 100644 --- a/src/console/piterminal.cpp +++ b/src/console/piterminal.cpp @@ -190,7 +190,7 @@ void PITerminal::write(PIKbdListener::SpecialKey k, PIKbdListener::KeyModifiers */ default: { //piCout << flags; - int mod = 0; + //int mod = 0; if (m[PIKbdListener::Shift]) m |= 1; if (m[PIKbdListener::Alt]) m |= 2; if (m[PIKbdListener::Ctrl]) m |= 4; diff --git a/src/thread/pipipelinethread.h b/src/thread/pipipelinethread.h index 4d815a14..111df4cc 100644 --- a/src/thread/pipipelinethread.h +++ b/src/thread/pipipelinethread.h @@ -127,6 +127,7 @@ private: } if (next_overload && wait_next_pipe) { mutex.unlock(); + piCoutObj << &next_overload; calculated(last, &next_overload); piMSleep(10); } else { @@ -140,18 +141,19 @@ private: mutex_l.unlock(); cnt++; // next_overload = true; + piCoutObj << &next_overload; calculated(r, &next_overload); } } } - PIQueue in; - Tout last; PIMutex mutex; PIMutex mutex_l; - ullong cnt; - uint max_size; bool wait_next_pipe; bool next_overload; + uint max_size; + ullong cnt; + PIQueue in; + Tout last; }; #endif // PIPIPELINETHREAD_H diff --git a/utils/system_daemon/daemon.h b/utils/system_daemon/daemon.h index 19265e71..0786462d 100644 --- a/utils/system_daemon/daemon.h +++ b/utils/system_daemon/daemon.h @@ -181,6 +181,7 @@ private: void requestChDir(const PIString & d); void sendDirToRemote(Remote * r); + bool inited__; mutable PIStringList available_daemons; PITimer dtimer; PIString conn_name; @@ -197,7 +198,6 @@ private: Remote * _self; RemoteMode mode; int offset, cur, height; - bool inited__; }; inline PIByteArray & operator <<(PIByteArray & b, const Daemon::HostInfo & v) {