Skip to content

Do not crash on GUI shutdown#5288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrchr-github merged 2 commits into from
Aug 9, 2023
Merged

Do not crash on GUI shutdown #5288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b36cd3d
Graceful thread shutdown in GUI
ntfshard Aug 2, 2023
fbc3a79
Review iteration
ntfshard Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions gui/checkthread.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@
#include "importproject.h"
#include "suppressions.h"

#include <atomic>

#include <QList>
#include <QObject>
#include <QString>
Expand DownExpand Up@@ -118,9 +120,9 @@ class CheckThread : public QThread {
};

/**
* @brief Thread's current execution state.
* @brief Thread's current execution state. Can be changed from outside
*/
State mState = Ready;
std::atomic<State> mState{Ready};

ThreadResult &mResult;
/**
Expand Down
5 changes: 4 additions & 1 deletion gui/threadhandler.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,10 @@ void ThreadHandler::setThreadCount(const int count)
void ThreadHandler::removeThreads()
{
for (CheckThread* thread : mThreads) {
thread->terminate();
if (thread->isRunning()) {
thread->terminate();
thread->wait();
}
disconnect(thread, &CheckThread::done,
this, &ThreadHandler::threadDone);
disconnect(thread, &CheckThread::fileChecked,
Expand Down