mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't override the finished QThread signal in LibraryCreator

Browse Source 
This should fix a crash in LibrariesUpdateCoordinator because the QThread can be destroyed before it finishes running.
This commit is contained in:
Luis Ángel San Martín Rodríguez 2024-12-28 11:25:05 +01:00
parent 97601282b8
commit 9c16d1ad81
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
YACReaderLibrary/library_creator.cpp
View File

@ -96,7 +96,7 @@ void LibraryCreator::updateFolder(const QString &source, const QString &target,
QString error = "Unable to find database at: " + _target; QString error = "Unable to find database at: " + _target;
QLOG_ERROR() << error; QLOG_ERROR() << error;
emit failedOpeningDB(error); emit failedOpeningDB(error);
emit finished(); emit completed();
return; return;
} }
@ -164,7 +164,7 @@ void LibraryCreator::run()
if (!_database.isOpen()) { if (!_database.isOpen()) {
QLOG_ERROR() << "Unable to create data base" << _database.lastError().databaseText() + "-" + _database.lastError().driverText(); QLOG_ERROR() << "Unable to create data base" << _database.lastError().databaseText() + "-" + _database.lastError().driverText();
emit failedCreatingDB(_database.lastError().databaseText() + "-" + _database.lastError().driverText()); emit failedCreatingDB(_database.lastError().databaseText() + "-" + _database.lastError().driverText());
emit finished(); emit completed();
creation = false; creation = false;
return; return;
} }
@ -193,7 +193,7 @@ void LibraryCreator::run()
QString error = "Unable to find database at: " + _target; QString error = "Unable to find database at: " + _target;
QLOG_ERROR() << error; QLOG_ERROR() << error;
emit failedOpeningDB(error); emit failedOpeningDB(error);
emit finished(); emit completed();
return; return;
} }
@ -203,7 +203,7 @@ void LibraryCreator::run()
if (!_database.open()) { if (!_database.open()) {
QLOG_ERROR() << "Unable to open database" << _database.lastError().databaseText() + "-" + _database.lastError().driverText(); QLOG_ERROR() << "Unable to open database" << _database.lastError().databaseText() + "-" + _database.lastError().driverText();
emit failedOpeningDB(_database.lastError().databaseText() + "-" + _database.lastError().driverText()); emit failedOpeningDB(_database.lastError().databaseText() + "-" + _database.lastError().driverText());
emit finished(); emit completed();
creation = false; creation = false;
return; return;
} }
@ -255,7 +255,7 @@ void LibraryCreator::run()
emit updatedCurrentFolder(folderDestinationModelIndex); emit updatedCurrentFolder(folderDestinationModelIndex);
} }
emit finished(); emit completed();
creation = false; creation = false;
} }

2
YACReaderLibrary/library_creator.h
View File

@ -62,7 +62,7 @@ private:
void cleanup(QSqlDatabase &db, const QString &target); void cleanup(QSqlDatabase &db, const QString &target);
signals: signals:
void finished(); void completed();
void coverExtracted(QString); void coverExtracted(QString);
void folderUpdated(QString); void folderUpdated(QString);
void comicAdded(QString, QString); void comicAdded(QString, QString);

5
YACReaderLibrary/library_window.cpp
View File

@ -706,12 +706,9 @@ void LibraryWindow::createConnections()
connect(createLibraryDialog, &CreateLibraryDialog::libraryExists, this, &LibraryWindow::libraryAlreadyExists); connect(createLibraryDialog, &CreateLibraryDialog::libraryExists, this, &LibraryWindow::libraryAlreadyExists);
connect(importComicsInfoDialog, &QDialog::finished, this, &LibraryWindow::reloadCurrentLibrary); connect(importComicsInfoDialog, &QDialog::finished, this, &LibraryWindow::reloadCurrentLibrary);
// connect(libraryCreator,SIGNAL(coverExtracted(QString)),createLibraryDialog,SLOT(showCurrentFile(QString))); connect(libraryCreator, &LibraryCreator::completed, this, &LibraryWindow::showRootWidget);
// connect(libraryCreator,SIGNAL(coverExtracted(QString)),updateLibraryDialog,SLOT(showCurrentFile(QString)));
connect(libraryCreator, &LibraryCreator::finished, this, &LibraryWindow::showRootWidget);
connect(libraryCreator, &LibraryCreator::updated, this, &LibraryWindow::reloadCurrentLibrary); connect(libraryCreator, &LibraryCreator::updated, this, &LibraryWindow::reloadCurrentLibrary);
connect(libraryCreator, &LibraryCreator::created, this, &LibraryWindow::openLastCreated); connect(libraryCreator, &LibraryCreator::created, this, &LibraryWindow::openLastCreated);
// connect(libraryCreator,SIGNAL(updatedCurrentFolder()), this, SLOT(showRootWidget()));
connect(libraryCreator, &LibraryCreator::updatedCurrentFolder, this, &LibraryWindow::reloadAfterCopyMove); connect(libraryCreator, &LibraryCreator::updatedCurrentFolder, this, &LibraryWindow::reloadAfterCopyMove);
connect(libraryCreator, &LibraryCreator::comicAdded, importWidget, &ImportWidget::newComic); connect(libraryCreator, &LibraryCreator::comicAdded, importWidget, &ImportWidget::newComic);
// libraryCreator errors // libraryCreator errors