mirror of
https://github.com/YACReader/yacreader
synced 2025-06-04 01:28:55 -04:00
Don't override the finished QThread signal in LibraryCreator
This should fix a crash in LibrariesUpdateCoordinator because the QThread can be destroyed before it finishes running.
This commit is contained in:
parent
97601282b8
commit
9c16d1ad81
@ -96,7 +96,7 @@ void LibraryCreator::updateFolder(const QString &source, const QString &target,
|
||||
QString error = "Unable to find database at: " + _target;
|
||||
QLOG_ERROR() << error;
|
||||
emit failedOpeningDB(error);
|
||||
emit finished();
|
||||
emit completed();
|
||||
return;
|
||||
}
|
||||
|
||||
@ -164,7 +164,7 @@ void LibraryCreator::run()
|
||||
if (!_database.isOpen()) {
|
||||
QLOG_ERROR() << "Unable to create data base" << _database.lastError().databaseText() + "-" + _database.lastError().driverText();
|
||||
emit failedCreatingDB(_database.lastError().databaseText() + "-" + _database.lastError().driverText());
|
||||
emit finished();
|
||||
emit completed();
|
||||
creation = false;
|
||||
return;
|
||||
}
|
||||
@ -193,7 +193,7 @@ void LibraryCreator::run()
|
||||
QString error = "Unable to find database at: " + _target;
|
||||
QLOG_ERROR() << error;
|
||||
emit failedOpeningDB(error);
|
||||
emit finished();
|
||||
emit completed();
|
||||
return;
|
||||
}
|
||||
|
||||
@ -203,7 +203,7 @@ void LibraryCreator::run()
|
||||
if (!_database.open()) {
|
||||
QLOG_ERROR() << "Unable to open database" << _database.lastError().databaseText() + "-" + _database.lastError().driverText();
|
||||
emit failedOpeningDB(_database.lastError().databaseText() + "-" + _database.lastError().driverText());
|
||||
emit finished();
|
||||
emit completed();
|
||||
creation = false;
|
||||
return;
|
||||
}
|
||||
@ -255,7 +255,7 @@ void LibraryCreator::run()
|
||||
emit updatedCurrentFolder(folderDestinationModelIndex);
|
||||
}
|
||||
|
||||
emit finished();
|
||||
emit completed();
|
||||
creation = false;
|
||||
}
|
||||
|
||||
|
@ -62,7 +62,7 @@ private:
|
||||
void cleanup(QSqlDatabase &db, const QString &target);
|
||||
|
||||
signals:
|
||||
void finished();
|
||||
void completed();
|
||||
void coverExtracted(QString);
|
||||
void folderUpdated(QString);
|
||||
void comicAdded(QString, QString);
|
||||
|
@ -706,12 +706,9 @@ void LibraryWindow::createConnections()
|
||||
connect(createLibraryDialog, &CreateLibraryDialog::libraryExists, this, &LibraryWindow::libraryAlreadyExists);
|
||||
connect(importComicsInfoDialog, &QDialog::finished, this, &LibraryWindow::reloadCurrentLibrary);
|
||||
|
||||
// connect(libraryCreator,SIGNAL(coverExtracted(QString)),createLibraryDialog,SLOT(showCurrentFile(QString)));
|
||||
// connect(libraryCreator,SIGNAL(coverExtracted(QString)),updateLibraryDialog,SLOT(showCurrentFile(QString)));
|
||||
connect(libraryCreator, &LibraryCreator::finished, this, &LibraryWindow::showRootWidget);
|
||||
connect(libraryCreator, &LibraryCreator::completed, this, &LibraryWindow::showRootWidget);
|
||||
connect(libraryCreator, &LibraryCreator::updated, this, &LibraryWindow::reloadCurrentLibrary);
|
||||
connect(libraryCreator, &LibraryCreator::created, this, &LibraryWindow::openLastCreated);
|
||||
// connect(libraryCreator,SIGNAL(updatedCurrentFolder()), this, SLOT(showRootWidget()));
|
||||
connect(libraryCreator, &LibraryCreator::updatedCurrentFolder, this, &LibraryWindow::reloadAfterCopyMove);
|
||||
connect(libraryCreator, &LibraryCreator::comicAdded, importWidget, &ImportWidget::newComic);
|
||||
// libraryCreator errors
|
||||
|
Loading…
x
Reference in New Issue
Block a user