Browse Source

Logbook displayModel correct instantiation, logbook backup name changed

George 4 years ago
parent
commit
7f05bb9254
2 changed files with 2 additions and 3 deletions
  1. 1 1
      src/database/adatabasesetup.cpp
  2. 1 2
      src/gui/widgets/logbookwidget.cpp

+ 1 - 1
src/database/adatabasesetup.cpp

@@ -305,7 +305,7 @@ bool ADataBaseSetup::backupOldData()
 
     auto date_string = QDateTime::currentDateTime().toString(Qt::ISODate);
     auto backup_dir = QDir(AStandardPaths::absPathOf(AStandardPaths::DatabaseBackup));
-    auto backup_name = database_file.baseName() + "-backup-" + date_string + ".bak";
+    auto backup_name = database_file.baseName() + "_bak_" + date_string + ".db";
     auto file = QFile(aDB()->databaseFile.absoluteFilePath());
 
     if (!file.rename(backup_dir.absolutePath() + '/' + backup_name)) {

+ 1 - 2
src/gui/widgets/logbookwidget.cpp

@@ -54,7 +54,6 @@ LogbookWidget::LogbookWidget(QWidget *parent) :
 
 LogbookWidget::~LogbookWidget()
 {
-    delete displayModel;  // [G]: previously leaked from logbookwidget.cpp:89
     delete ui;
 }
 
@@ -86,7 +85,7 @@ void LogbookWidget::connectSignalsAndSlots()
 void LogbookWidget::setupDefaultView()
 {
     DEB << "Loading Default View...";
-    displayModel = new QSqlTableModel;
+    displayModel = new QSqlTableModel(this);
     displayModel->setTable("viewDefault");
     displayModel->select();