diff -r bbf46f59e123 -r 25ffed67c7ef windowing/windowserver/nga/SERVER/wsdisplaychangeao.cpp --- a/windowing/windowserver/nga/SERVER/wsdisplaychangeao.cpp Tue Aug 31 16:31:06 2010 +0300 +++ b/windowing/windowserver/nga/SERVER/wsdisplaychangeao.cpp Wed Sep 01 12:39:21 2010 +0100 @@ -281,18 +281,18 @@ iOwner->IncreaseConfigSpinner(); - //if the config change comes from a render stage then ensure screen device size - //is also updated - TSize currentRes; - currentConfig.GetResolution(currentRes); - TBool disconnected = (currentRes.iHeight == 0 || currentRes.iWidth == 0) ? ETrue : EFalse; + //if the config change comes from a render stage then ensure screen device size + //is also updated + TSize currentRes; + currentConfig.GetResolution(currentRes); + TBool disconnected = (currentRes.iHeight == 0 || currentRes.iWidth == 0) ? ETrue : EFalse; - //if the config change is due to CScreen::SetConfiguration() being called then we - //don't want to update it again. Only update if the configs are different and the - //display is connected... - TDisplayConfiguration lastSetConfig(iLastSetConfig); - if (!((currentConfig == lastSetConfig) || (disconnected))) - { + //if the config change is due to CScreen::SetConfiguration() being called then we + //don't want to update it again. Only update if the configs are different and the + //display is connected... + TDisplayConfiguration lastSetConfig(iLastSetConfig); + if (!((currentConfig == lastSetConfig) || (disconnected))) + { TDisplayConfiguration1::TRotation rotation; if (lastSetConfig.GetRotation(rotation)) { @@ -301,8 +301,8 @@ currentConfig.SetRotation(rotation); } iOwner->UpdateConfiguration(currentConfig); - } - + } + //put config change event on queue RPointerArray clientArray; CleanupClosePushL(clientArray); @@ -332,7 +332,6 @@ { IssueNotificationRequest(); } - }