Changeset 89741 in vbox

Timestamp:

Jun 16, 2021 1:38:35 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:3355. Re-activate screen saver during vm poweroff.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h (modified) (1 diff)

trunk/Config.kmk

@@ -7112 +7112 @@
    TEMPLATE_VBOXQTGUIEXE_LDFLAGS += -IntegrityCheck
   endif
+  TEMPLATE_VBOXQTGUIEXE_LDFLAGS += -Wl,-rpath,$(PATH_SDK_QT5_LIB) 
+
   TEMPLATE_VBOXQTGUIEXE_SDKS += $(VBOX_WINPSDK)
   if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
@@ -7186 +7188 @@
   ifeq ($(KBUILD_TARGET),linux)
    TEMPLATE_VBOXQTGUIEXE_LDFLAGS += -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
+   TEMPLATE_VBOXQTGUIEXE_LDFLAGS += -Wl,-rpath,$(PATH_SDK_QT5_LIB) 
    TEMPLATE_VBOXQTGUIEXE_LIBS += \
      $(VBOX_XCURSOR_LIBS) \

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -2847 +2847 @@
     sltCloseGuestControlConsoleDialog();
 #endif
+    activateScreenSaver();
     sltCloseFileManagerDialog();
     sltCloseVMInformationDialog();
@@ -3334 +3335 @@
 }
 
+void UIMachineLogic::activateScreenSaver()
+{
+    /* Do nothing if we did not de-activated the host screen saver: */
+    if (!gEDataManager->disableHostScreenSaver())
+        return;
+
+    QVector<CMachine> machines = uiCommon().virtualBox().GetMachines();
+    bool fAnother = false;
+    for (int i = 0; i < machines.size(); ++i)
+    {
+        if (machines[i].GetState() == KMachineState_Running && machines[i].GetId() != machine().GetId())
+        {
+            fAnother = true;
+            break;
+        }
+    }
+
+    /* Do nothing if there are other vms running.*/
+    if (fAnother)
+        return;
+    sltDisableHostScreenSaverStateChanged(false);
+}
+
 #ifdef VBOX_WITH_DEBUGGER_GUI
 bool UIMachineLogic::dbgCreated()

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -399 +399 @@
     void takeScreenshot(const QString &strFile, const QString &strFormat /* = "png" */) const;
 
+    /** Reactivates the screen saver. This is possbily called during vm window close and enables host screen
+      * if there are no other vms running at the moment. */
+    void activateScreenSaver();
+
     /* Private variables: */
     UISession *m_pSession;