Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp	(revision 38960)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp	(revision 38961)
@@ -158,7 +158,4 @@
     AssertMsg(newSize.isValid(), ("Size should be valid!\n"));
 
-    /* Remember the new size: */
-    storeConsoleSize(newSize.width(), newSize.height());
-
     /* Send new size-hint to the guest: */
     session().GetConsole().GetDisplay().SetVideoModeHint(newSize.width(), newSize.height(), 0, screenId());
@@ -674,5 +671,6 @@
 void UIMachineView::storeConsoleSize(int iWidth, int iHeight)
 {
-    m_storedConsoleSize = QSize(iWidth, iHeight);
+    if (m_desktopGeometryType == DesktopGeo_Automatic)
+        m_storedConsoleSize = QSize(iWidth, iHeight);
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp	(revision 38960)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp	(revision 38961)
@@ -126,7 +126,4 @@
             setMaximumSize(sizeHint());
 
-            /* Store the new size to prevent unwanted resize hints being sent back: */
-            storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
-
             /* Perform machine-view resize: */
             resize(pResizeEvent->width(), pResizeEvent->height());
@@ -186,4 +183,6 @@
                 if (pResizeEvent->size() != workingArea().size())
                     break;
+                /* Store the new size */
+                storeConsoleSize(pResizeEvent->size().width(), pResizeEvent->size().height());
 
                 if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp	(revision 38960)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp	(revision 38961)
@@ -77,7 +77,4 @@
 UIMachineViewNormal::~UIMachineViewNormal()
 {
-    /* Save machine view settings: */
-    saveMachineViewSettings();
-
     /* Cleanup frame buffer: */
     cleanupFrameBuffer();
@@ -116,7 +113,4 @@
             setMaximumSize(sizeHint());
 
-            /* Store the new size to prevent unwanted resize hints being sent back: */
-            storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
-
             /* Perform machine-view resize: */
             resize(pResizeEvent->width(), pResizeEvent->height());
@@ -174,4 +168,8 @@
             case QEvent::Resize:
             {
+                const QSize *pSize = &static_cast<QResizeEvent *>(pEvent)
+                                    ->size();
+                /* Store the new size */
+                storeConsoleSize(pSize->width(), pSize->height());
                 if (pEvent->spontaneous() && m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
                     QTimer::singleShot(300, this, SLOT(sltPerformGuestResize()));
@@ -252,10 +250,4 @@
 }
 
-void UIMachineViewNormal::saveMachineViewSettings()
-{
-    /* Store guest size hint: */
-    storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
-}
-
 void UIMachineViewNormal::setGuestAutoresizeEnabled(bool fEnabled)
 {
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.h	(revision 38960)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.h	(revision 38961)
@@ -67,5 +67,5 @@
 
     /* Cleanup helpers: */
-    void saveMachineViewSettings();
+    // void saveMachineViewSettings();
     //void cleanupConsoleConnections() {}
     //void prepareConnections() {}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp	(revision 38960)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp	(revision 38961)
@@ -76,7 +76,4 @@
 UIMachineViewScale::~UIMachineViewScale()
 {
-    /* Save machine view settings: */
-    saveMachineViewSettings();
-
     /* Cleanup frame buffer: */
     cleanupFrameBuffer();
@@ -175,7 +172,4 @@
             frameBuffer()->setScaledSize(size());
             frameBuffer()->resizeEvent(pResizeEvent);
-
-            /* Store the new size to prevent unwanted resize hints being sent back: */
-            storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
 
             /* Let our toplevel widget calculate its sizeHint properly: */
@@ -353,10 +347,4 @@
 }
 
-void UIMachineViewScale::saveMachineViewSettings()
-{
-    /* Store guest size hint: */
-    storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
-}
-
 QSize UIMachineViewScale::sizeHint() const
 {
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.h	(revision 38960)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.h	(revision 38961)
@@ -64,5 +64,5 @@
 
     /* Cleanup helpers: */
-    void saveMachineViewSettings();
+    // void saveMachineViewSettings();
     //void cleanupConnections() {}
     //void cleanupFrameBuffer() {}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp	(revision 38960)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp	(revision 38961)
@@ -137,7 +137,4 @@
             setMaximumSize(sizeHint());
 
-            /* Store the new size to prevent unwanted resize hints being sent back: */
-            storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
-
             /* Perform machine-view resize: */
             resize(pResizeEvent->width(), pResizeEvent->height());
@@ -194,4 +191,6 @@
                 if (pResizeEvent->size() != workingArea().size())
                     break;
+                /* Store the new size to prevent unwanted resize hints being sent back: */
+                storeConsoleSize(pResizeEvent->size().width(), pResizeEvent->size().height());
 
                 if (uisession()->isGuestSupportsGraphics())