From 32093a62fd6ad9034618bf276c10280fd86c6b0e 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: Tue, 25 Sep 2018 13:05:18 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@629 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/system/piprocess.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src_main/system/piprocess.h b/src_main/system/piprocess.h index 57c19382..82c22a08 100755 --- a/src_main/system/piprocess.h +++ b/src_main/system/piprocess.h @@ -38,7 +38,7 @@ /// bool exec(const PIString & program, const PIStringList & args) /// void terminate() /// bool waitForFinish(int timeout_msecs = 60000) -class PIP_EXPORT PIProcess: protected PIThread +class PIP_EXPORT PIProcess: public PIThread { PIOBJECT_SUBCLASS(PIProcess, PIThread) public: @@ -70,7 +70,7 @@ public: EVENT_HANDLER1(void, exec, const PIString & , program) {args.clear(); args << program; exec_();} void exec(const PIString & program, const PIString & arg) {args.clear(); args << program << arg; exec_();} - EVENT_HANDLER2(void, exec, const PIString & , program, const PIStringList & , args_) {args << program << args_; exec_();} + EVENT_HANDLER2(void, exec, const PIString & , program, const PIStringList & , args_) {args.clear(); args << program << args_; exec_();} EVENT_HANDLER(void, terminate); EVENT_HANDLER(bool, waitForFinish) {return waitForFinish(60000);} EVENT_HANDLER1(bool, waitForFinish, int, timeout_msecs) {return PIThread::waitForFinish(timeout_msecs);}