github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-31 03:50:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Prevent crash when open torrent destination folder

Browse source 
Uses the same workaround as Qt does to call ShellExecute() when you use QDesktopServices::openUrl().
PR #16670.
Closes #16423.
This commit is contained in:
Vladimir Golovnev 2022-03-20 11:08:27 +03:00 • committed by GitHub
parent e71e97cb68
commit 5960e7dda6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/gui/utils.cpp
View file

@ -43,6 +43,7 @@
#include <QRegularExpression> #include <QRegularExpression>
#include <QScreen> #include <QScreen>
#include <QStyle> #include <QStyle>
#include <QThread>
#include <QUrl> #include <QUrl>
#include <QWidget> #include <QWidget>
#include <QWindow> #include <QWindow>
@ -159,15 +160,22 @@ void Utils::Gui::openFolderSelect(const Path &path)
} }
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
HRESULT hresult = ::CoInitializeEx(nullptr, COINIT_MULTITHREADED); auto *thread = QThread::create([path]()
PIDLIST_ABSOLUTE pidl = ::ILCreateFromPathW(reinterpret_cast<PCTSTR>(path.toString().utf16()));
if (pidl)
{ {
::SHOpenFolderAndSelectItems(pidl, 0, nullptr, 0); if (SUCCEEDED(::CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE)))
::ILFree(pidl); {
} PIDLIST_ABSOLUTE pidl = ::ILCreateFromPathW(reinterpret_cast<const wchar_t *>(path.toString().utf16()));
if ((hresult == S_OK) || (hresult == S_FALSE)) if (pidl)
::CoUninitialize(); {
::SHOpenFolderAndSelectItems(pidl, 0, nullptr, 0);
::ILFree(pidl);
}
::CoUninitialize();
}
});
QObject::connect(thread, &QThread::finished, thread, &QObject::deleteLater);
thread->start();
#elif defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) #elif defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
QProcess proc; QProcess proc;
proc.start(u"xdg-mime"_qs, {u"query"_qs, u"default"_qs, u"inode/directory"_qs}); proc.start(u"xdg-mime"_qs, {u"query"_qs, u"default"_qs, u"inode/directory"_qs});