Changeset 94789 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

May 3, 2022 7:00:13 AM (3 years ago)

Author:

vboxsync

Message:

Main/MachineImpl: Fix registering an encrypted machine, bugref:9955

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -676 +676 @@
                     mData->mAccessError = com::ErrorInfo();
 
-                    throw setError(VBOX_E_PASSWORD_INCORRECT,
-                                   tr("Decryption of the machine {%RTuuid} failed. Incorrect or unknown password"),
-                                   mData->pMachineConfigFile->uuid.raw());
+                    setError(VBOX_E_PASSWORD_INCORRECT,
+                             tr("Decryption of the machine {%RTuuid} failed. Incorrect or unknown password"),
+                             mData->pMachineConfigFile->uuid.raw());
                 }
                 else
@@ -1001 +1001 @@
 
                 if (mData->pMachineConfigFile->enmParseState == settings::MachineConfigFile::ParseState_PasswordError)
-                    throw setError(VBOX_E_PASSWORD_INCORRECT,
-                                   tr("Config decryption of the machine {%RTuuid} failed. Incorrect or unknown password"),
-                                   mData->pMachineConfigFile->uuid.raw());
+                    rc = setError(VBOX_E_PASSWORD_INCORRECT,
+                                  tr("Config decryption of the machine {%RTuuid} failed. Incorrect or unknown password"),
+                                  mData->pMachineConfigFile->uuid.raw());
+                else
 #endif
-
-                rc = i_loadMachineDataFromSettings(*mData->pMachineConfigFile,
-                                                   NULL /* const Guid *puuidRegistry */);
+                    rc = i_loadMachineDataFromSettings(*mData->pMachineConfigFile,
+                                                       NULL /* const Guid *puuidRegistry */);
                 if (FAILED(rc)) throw rc;
             }