Fixed handling of appendices when using encryption

RWTH-HPC · Feb 28, 2018 · 37005f6 · 37005f6
1 parent a4bb01c
commit 37005f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,10 +17,10 @@ compiler:
   - gcc
 
 env:
-  - QT_BASE=59 QT_LONG=594 CONFIG=debug
-  - QT_BASE=59 QT_LONG=594 CONFIG=release DEPLOY=true
-  - QT_BASE=59 QT_LONG=594 CONFIG=debug CRYPT=crypt
-  - QT_BASE=59 QT_LONG=594 CONFIG=release CRYPT=crypt DEPLOY=true
+  - QT_BASE=510 QT_LONG=5.10.1 CONFIG=debug
+  - QT_BASE=510 QT_LONG=5.10.1 CONFIG=release DEPLOY=true
+  - QT_BASE=510 QT_LONG=5.10.1 CONFIG=debug CRYPT=crypt
+  - QT_BASE=510 QT_LONG=5.10.1 CONFIG=release CRYPT=crypt DEPLOY=true
 
 matrix:
   exclude:

diff --git a/src/setupdialog.cc b/src/setupdialog.cc
@@ -47,7 +47,6 @@ SetupDialog::SetupDialog(MainWindow *window, Crypt *crypt) : QDialog() {
   project_ = new Project(crypt);
   new_project_flag_ = true;
   settings_.setValue("conf/append", false);
-  append_activity_ = new Activity;
   Setup();
   CreateConnections();
   LoadSettings();
@@ -412,15 +411,13 @@ bool SetupDialog::ProjectHandler() {
     project_->ClearProject();
 #ifdef CRYPT
     bool status = project_->Load(project_dir_);
-    main_window_->AddAppendices();
 
     while (status == false) {
       PasswordDialog *pwd = new PasswordDialog(crypt_, false);
       if (pwd->exec() == QDialog::Rejected) {
         return false;
       }
       status = project_->Load(project_dir_);
-      main_window_->AddAppendices();
       if (status == false) {
         QMessageBox box;
         box.setInformativeText("Password Incorrect.");