git-svn-id: svn://db.shs.com.ru/pip@709 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
@@ -347,7 +347,7 @@ void PIObject::piDisconnect(PIObject * src, const PIString & sig) {
|
|||||||
PIObject * dest = cc.dest_o;
|
PIObject * dest = cc.dest_o;
|
||||||
src->connections.remove(i);
|
src->connections.remove(i);
|
||||||
i--;
|
i--;
|
||||||
#ifndef ANDROID
|
#if !defined(ANDROID) && !defined(MAC_OS) && !defined(FREERTOS)
|
||||||
PIMutexLocker _mld(dest->mutex_connect, src != dest);
|
PIMutexLocker _mld(dest->mutex_connect, src != dest);
|
||||||
#endif
|
#endif
|
||||||
dest->updateConnectors();
|
dest->updateConnectors();
|
||||||
@@ -364,10 +364,8 @@ void PIObject::piDisconnect(PIObject * src) {
|
|||||||
//piCout << "disconnect"<< src->className()<< o->className();
|
//piCout << "disconnect"<< src->className()<< o->className();
|
||||||
if (!o || (o == src)) continue;
|
if (!o || (o == src)) continue;
|
||||||
if (!o->isPIObject()) continue;
|
if (!o->isPIObject()) continue;
|
||||||
#ifndef ANDROID
|
#if !defined(ANDROID) && !defined(MAC_OS) && !defined(FREERTOS)
|
||||||
# ifndef MAC_OS
|
|
||||||
PIMutexLocker _mld(o->mutex_connect, src != o);
|
PIMutexLocker _mld(o->mutex_connect, src != o);
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
PIVector<__Connection> & oc(o->connections);
|
PIVector<__Connection> & oc(o->connections);
|
||||||
for (int i = 0; i < oc.size_s(); ++i) {
|
for (int i = 0; i < oc.size_s(); ++i) {
|
||||||
|
|||||||
Reference in New Issue
Block a user