mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2024-10-22 18:56:08 +03:00
searchengine: use kill() instead of terminate() on Windows
This commit is contained in:
parent
3a9cf70228
commit
7c00e80f7a
1 changed files with 9 additions and 1 deletions
|
@ -482,7 +482,11 @@ void SearchEngine::appendSearchResult(const QString &line)
|
||||||
{
|
{
|
||||||
if (activeSearchTab.isNull()) {
|
if (activeSearchTab.isNull()) {
|
||||||
if (searchProcess->state() != QProcess::NotRunning) {
|
if (searchProcess->state() != QProcess::NotRunning) {
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
searchProcess->kill();
|
||||||
|
#else
|
||||||
searchProcess->terminate();
|
searchProcess->terminate();
|
||||||
|
#endif
|
||||||
searchProcess->waitForFinished(1000);
|
searchProcess->waitForFinished(1000);
|
||||||
}
|
}
|
||||||
if (searchTimeout->isActive())
|
if (searchTimeout->isActive())
|
||||||
|
@ -532,8 +536,12 @@ void SearchEngine::closeTab(int index)
|
||||||
// Search is run for active tab so if user decided to close it, then stop search
|
// Search is run for active tab so if user decided to close it, then stop search
|
||||||
if (!activeSearchTab.isNull() && index == tabWidget->indexOf(activeSearchTab)) {
|
if (!activeSearchTab.isNull() && index == tabWidget->indexOf(activeSearchTab)) {
|
||||||
qDebug("Closed active search Tab");
|
qDebug("Closed active search Tab");
|
||||||
if (searchProcess->state() != QProcess::NotRunning)
|
if (searchProcess->state() != QProcess::NotRunning) {
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
searchProcess->kill();
|
||||||
|
#else
|
||||||
searchProcess->terminate();
|
searchProcess->terminate();
|
||||||
|
#endif
|
||||||
searchProcess->waitForFinished(1000);
|
searchProcess->waitForFinished(1000);
|
||||||
}
|
}
|
||||||
if (searchTimeout->isActive())
|
if (searchTimeout->isActive())
|
||||||
|
|
Loading…
Reference in a new issue