Ref T554, improved auto publishing handling during shutdown

This commit is contained in:
Klaus Basan
2019-07-16 02:51:54 +02:00
parent 80f7e1526b
commit 1fe055545b
7 changed files with 21 additions and 6 deletions

View File

@@ -217,8 +217,13 @@ void CSwiftData::checkMinimumVersion()
void CSwiftData::checkAutoPublishing()
{
if (!sApp || sApp->isShuttingDown()) { return; }
if (!CAutoPublishData::existAutoPublishFiles()) { return; }
this->showAutoPublishing();
}
void CSwiftData::showAutoPublishing()
{
if (!sApp || sApp->isShuttingDown()) { return; }
if (!m_autoPublishDialog) { m_autoPublishDialog = new CAutoPublishDialog(this); }
m_autoPublishDialog->readAndShow();
}

View File

@@ -70,9 +70,11 @@ private:
//! Check auto-publishing
void checkAutoPublishing();
//! Show auto publishing
void showAutoPublishing();
void performGracefulShutdown();
void consolidationSettingChanged();
void displayConsole();
void displayLog();
void checkMinimumVersion();

View File

@@ -55,7 +55,7 @@ void CSwiftData::initDynamicMenus()
ui->menu_InfoAreas->addActions(ui->comp_MainInfoArea->getInfoAreaSelectActions(true, ui->menu_InfoAreas));
// menu entry for auto publish data
ui->menu_Mapping->addAction(CIcons::database16(), "Auto publish data", this, &CSwiftData::checkAutoPublishing);
ui->menu_Mapping->addAction(CIcons::database16(), "Auto publish data", this, &CSwiftData::showAutoPublishing);
QString resourceDir(CDirectoryUtils::shareDirectory());
if (!resourceDir.isEmpty() && QDir(resourceDir).exists())