From 51da261a56a7b3dc42bb7cd8ffa11c1db8be8a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Tue, 7 Apr 2015 09:40:58 +0000 Subject: [PATCH] PIDir fix PICoutManipulator git-svn-id: svn://db.shs.com.ru/pip@68 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src/io/pidiagnostics.h | 2 +- src/io/pidir.cpp | 1 + utils/udp_file_transfer/main.cpp | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/io/pidiagnostics.h b/src/io/pidiagnostics.h index c5d53865..1a188f1e 100755 --- a/src/io/pidiagnostics.h +++ b/src/io/pidiagnostics.h @@ -32,7 +32,7 @@ class PIP_EXPORT PIDiagnostics: public PITimer friend class PIConnection; public: - //! Constructs an empty diagnostics and if "strat_" start it + //! Constructs an empty diagnostics and if "start_" start it PIDiagnostics(bool start_ = true); virtual ~PIDiagnostics() {;} diff --git a/src/io/pidir.cpp b/src/io/pidir.cpp index 5d383a33..c7a4310c 100755 --- a/src/io/pidir.cpp +++ b/src/io/pidir.cpp @@ -165,6 +165,7 @@ PIString PIDir::relative(const PIString & path) const { PIDir & PIDir::setDir(const PIString & path) { path_ = path; #ifdef WINDOWS + path_.replaceAll("\\", separator); if (path_.length() > 2) if (path_.mid(1, 2).contains(":")) path_.prepend(separator); diff --git a/utils/udp_file_transfer/main.cpp b/utils/udp_file_transfer/main.cpp index 16df88f7..31c8b390 100644 --- a/utils/udp_file_transfer/main.cpp +++ b/utils/udp_file_transfer/main.cpp @@ -113,12 +113,13 @@ int main (int argc, char * argv[]) { if (fls.size() > 0) { piCout << "send files" << fls; f.startSend(fls); + PICout(0) << "\n"; return 0; } else { piCout << "wait for receiving"; } WAIT_FOR_EXIT - PICout() << "\n"; + PICout(0) << "\n"; return 0; }