mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Library: don't leak folderQueryResultProcessor at exit

Browse Source 
FolderQueryResultProcessor has a ConcurrentQueue data member. The leak
meant that the thread was not joined before exit.
This commit is contained in:
Igor Kushnir 2021-02-03 21:31:10 +02:00
parent 117b02fc7f
commit 64d0e22fb5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
YACReaderLibrary/library_window.cpp
View File

@ -415,7 +415,7 @@ void LibraryWindow::doModels()
//folders //folders
foldersModel = new FolderModel(); foldersModel = new FolderModel();
foldersModelProxy = new FolderModelProxy(); foldersModelProxy = new FolderModelProxy();
folderQueryResultProcessor = new FolderQueryResultProcessor(foldersModel); folderQueryResultProcessor.reset(new FolderQueryResultProcessor(foldersModel));
//foldersModelProxy->setSourceModel(foldersModel); //foldersModelProxy->setSourceModel(foldersModel);
//comics //comics
comicsModel = new ComicModel(this); comicsModel = new ComicModel(this);
@ -1116,7 +1116,7 @@ void LibraryWindow::createConnections()
//Search filter //Search filter
connect(searchEdit, SIGNAL(filterChanged(YACReader::SearchModifiers, QString)), this, SLOT(setSearchFilter(YACReader::SearchModifiers, QString))); connect(searchEdit, SIGNAL(filterChanged(YACReader::SearchModifiers, QString)), this, SLOT(setSearchFilter(YACReader::SearchModifiers, QString)));
connect(&comicQueryResultProcesor, &ComicQueryResultProcesor::newData, this, &LibraryWindow::setComicSearchFilterData); connect(&comicQueryResultProcesor, &ComicQueryResultProcesor::newData, this, &LibraryWindow::setComicSearchFilterData);
connect(folderQueryResultProcessor, &FolderQueryResultProcessor::newData, this, &LibraryWindow::setFolderSearchFilterData); connect(folderQueryResultProcessor.get(), &FolderQueryResultProcessor::newData, this, &LibraryWindow::setFolderSearchFilterData);
//ContextMenus //ContextMenus
connect(openContainingFolderComicAction, SIGNAL(triggered()), this, SLOT(openContainingFolderComic())); connect(openContainingFolderComicAction, SIGNAL(triggered()), this, SLOT(openContainingFolderComic()));

3
YACReaderLibrary/library_window.h
View File

@ -14,6 +14,7 @@
#include "folder_query_result_processor.h" #include "folder_query_result_processor.h"
#include <future> #include <future>
#include <memory>
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
#include "yacreader_macosx_toolbar.h" #include "yacreader_macosx_toolbar.h"
@ -416,7 +417,7 @@ private:
TrayIconController *trayIconController; TrayIconController *trayIconController;
ComicQueryResultProcesor comicQueryResultProcesor; ComicQueryResultProcesor comicQueryResultProcesor;
FolderQueryResultProcessor *folderQueryResultProcessor; std::unique_ptr<FolderQueryResultProcessor> folderQueryResultProcessor;
}; };
#endif #endif