From 37005f6e29100456732258dd5cb7341f5bfb31f3 Mon Sep 17 00:00:00 2001
From: julianmi <julianmi@users.noreply.github.com>
Date: Wed, 28 Feb 2018 16:51:42 +0100
Subject: [PATCH] Fixed handling of appendices when using encryption

---
 .travis.yml        | 8 ++++----
 src/setupdialog.cc | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ebcfd32..e620d9a 100644
--- 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
index c1ac51f..b4eb2e2 100644
--- 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,7 +411,6 @@ 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);
@@ -420,7 +418,6 @@ bool SetupDialog::ProjectHandler() {
         return false;
       }
       status = project_->Load(project_dir_);
-      main_window_->AddAppendices();
       if (status == false) {
         QMessageBox box;
         box.setInformativeText("Password Incorrect.");