Subversion Repositories tpanel

Rev

Rev 321 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 321 Rev 323
Line 488... Line 488...
488 
 
 488 
 
489 
bool TObject::enableObject(ulong handle)
 489 
bool TObject::enableObject(ulong handle)
490 
{
 490 
{
491 
    DECL_TRACER("TObject::enableObject(ulong handle)");
 491 
    DECL_TRACER("TObject::enableObject(ulong handle)");
492 
 
 492 
 
493 
    TLOCKER(mutex_obj);
 - 
 
494 
    map<ulong, OBJECT_t>::iterator iter = mObjects.find(handle);
 493 
    map<ulong, OBJECT_t>::iterator iter = mObjects.find(handle);
495 
 
 494 
 
496 
    if (iter != mObjects.end())
 495 
    if (iter != mObjects.end())
497 
    {
 496 
    {
498 
        if (!iter->second.object.widget)
 497 
        if (!iter->second.object.widget)
Line 500... Line 499...
500 
            iter->second.remove = true;
 499 
            iter->second.remove = true;
501 
            MSG_ERROR("Object " << handleToString(iter->first) << " of type " << objectToString(iter->second.type) << " has no QObject!");
 500 
            MSG_ERROR("Object " << handleToString(iter->first) << " of type " << objectToString(iter->second.type) << " has no QObject!");
502 
            return false;
 501 
            return false;
503 
        }
 502 
        }
504 
 
 503 
 
- 
 
 504 
        TLOCKER(mutex_obj);
505 
        iter->second.remove = false;
 505 
        iter->second.remove = false;
506 
        iter->second.invalid = false;
 506 
        iter->second.invalid = false;
507 
 
 507 
 
508 
        if (iter->second.type == OBJ_SUBVIEW && iter->second.object.area && mMainWindow && !iter->second.connected)
 508 
        if (iter->second.type == OBJ_SUBVIEW && iter->second.object.area && mMainWindow && !iter->second.connected)
509 
        {
 509 
        {