VirtualBox

Changeset 8695

Show
Ignore:
Timestamp:
05/08/08 09:41:22 (8 months ago)
Author:
vboxsync
Message:

X11 Additions: improved termination of VBoxClient

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/VBox/Additions/x11/xclient/displaychange-x11.cpp

    r8476 r8695  
    8181    { 
    8282        uint32_t cx = 0, cy = 0, cBits = 0, iDisplay = 0; 
    83         int rc = VbglR3DisplayChangeWaitEvent(&cx, &cy, &cBits, &iDisplay); 
     83        rc = VbglR3DisplayChangeWaitEvent(&cx, &cy, &cBits, &iDisplay); 
    8484        /* Ignore the request if it is stale */ 
    8585        if ((cx != cx0) || (cy != cy0)) 
     
    8787                /* If we are not stopping, sleep for a bit to avoid using up too 
    8888                    much CPU while retrying. */ 
    89                 if (RT_FAILURE(rc) && !mThread->isStopping()) 
    90                     mThread->yield(); 
     89                if (RT_FAILURE(rc)) 
     90                { 
     91                    if (!mThread->isStopping()) 
     92                        mThread->yield(); 
     93                } 
    9194                else 
    9295                    system("VBoxRandR"); 
  • trunk/src/VBox/Additions/x11/xclient/main.cpp

    r8640 r8695  
    141141    /** Disable seamless mode */ 
    142142    VbglR3SeamlessSetCap(false); 
    143     VbglR3Term(); 
     143    printf(("VBoxClient: terminating...\n")); 
     144    /* don't call VbglR3Term() here otherwise the /dev/vboxadd filehandle is closed */ 
    144145    /* Our pause() call will now return and exit. */ 
    145146} 
     
    290291    try 
    291292    { 
     293        /* r=frank: Why all these 2s delays? What are we waiting for? */ 
    292294#ifdef DYNAMIC_RESIZE 
    293295# ifdef SEAMLESS_GUEST 
  • trunk/src/VBox/Additions/x11/xclient/seamless.h

    r8155 r8695  
    183183        if (isInitialised) 
    184184        { 
    185             mHost.stop(); 
     185            mHost.stop(cMillies); 
    186186            mGuestThread.stop(cMillies, 0); 
    187187            mGuest.uninit(); 

© 2008 Sun Microsystems, Inc.
ContactPrivacy policy