diff options
Diffstat (limited to 'src/VBox/Main/src-client/ConsoleImpl.cpp')
| -rw-r--r-- | src/VBox/Main/src-client/ConsoleImpl.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/VBox/Main/src-client/ConsoleImpl.cpp b/src/VBox/Main/src-client/ConsoleImpl.cpp index 126edde3a..3a01ad937 100644 --- a/src/VBox/Main/src-client/ConsoleImpl.cpp +++ b/src/VBox/Main/src-client/ConsoleImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: ConsoleImpl.cpp 37851 2011-07-08 17:04:03Z vboxsync $ */ +/* $Id: ConsoleImpl.cpp $ */ /** @file * VBox Console COM Class implementation */ @@ -6427,7 +6427,9 @@ HRESULT Console::powerUp(IProgress **aProgress, bool aPaused) rc = consoleInitReleaseLog(mMachine); if (FAILED(rc)) throw rc; +#ifdef VBOX_WITH_EXTPACK mptrExtPackManager->dumpAllToReleaseLog(); +#endif #ifdef RT_OS_SOLARIS /* setup host core dumper for the VM */ @@ -7133,7 +7135,6 @@ HRESULT Console::createSharedFolder(const Utf8Str &strName, const SharedFolderDa Log(("Adding shared folder '%s' -> '%s'\n", strName.c_str(), aData.m_strHostPath.c_str())); // check whether the path is valid and exists - /* Check whether the path is full (absolute) */ char hostPathFull[RTPATH_MAX]; int vrc = RTPathAbsEx(NULL, aData.m_strHostPath.c_str(), @@ -7143,15 +7144,15 @@ HRESULT Console::createSharedFolder(const Utf8Str &strName, const SharedFolderDa return setError(E_INVALIDARG, tr("Invalid shared folder path: '%s' (%Rrc)"), aData.m_strHostPath.c_str(), vrc); - - if (RTPathCompare(aData.m_strHostPath.c_str(), hostPathFull) != 0) - return setError(E_INVALIDARG, - tr("Shared folder path '%s' is not absolute"), - aData.m_strHostPath.c_str()); if (!RTPathExists(hostPathFull)) return setError(E_INVALIDARG, tr("Shared folder path '%s' does not exist on the host"), aData.m_strHostPath.c_str()); + /* Check whether the path is full (absolute) */ + if (RTPathCompare(aData.m_strHostPath.c_str(), hostPathFull) != 0) + return setError(E_INVALIDARG, + tr("Shared folder path '%s' is not absolute"), + aData.m_strHostPath.c_str()); // now that we know the path is good, give it to HGCM |