fix the token count

3 files changed, 6 insertions, 1 deletions

diff --git a/dialog.cpp b/dialog.cpp
index e8fb3be6..bdad984c 100644
--- a/dialog.cpp
+++ b/dialog.cpp
@@ -813,6 +813,7 @@ void Dialog::startMinimized(bool startMinimized) {
  */
 void Dialog::on_checkBoxUseTemplate_clicked() {
     ui->plainTextEditTemplate->setEnabled(ui->checkBoxUseTemplate->isChecked());
+    ui->checkBoxTemplateAllFields->setEnabled(ui->checkBoxUseTemplate->isChecked());
 }
 
 void Dialog::useTemplate(bool useTemplate) {
diff --git a/mainwindow.cpp b/mainwindow.cpp
index d0493bf0..ff9d6f6a 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -642,6 +642,9 @@ void MainWindow::readyRead(bool finished = false) {
             if (useClipboard && !output.isEmpty()) {
                 QClipboard *clip = QApplication::clipboard();
                 QStringList tokens =  output.split("\n");
+
+                // TODO
+
                 clip->setText(tokens[0]);
                 ui->statusBar->showMessage(tr("Password copied to clipboard"), 3000);
                 if (useAutoclear) {
diff --git a/passworddialog.cpp b/passworddialog.cpp
index 08f91ff1..3b102d3c 100644
--- a/passworddialog.cpp
+++ b/passworddialog.cpp
@@ -58,7 +58,6 @@ void PasswordDialog::setPassword(QString password)
             for (int j = 0; j < tokens.length(); j++) {
                 QString token = tokens.at(j);
                 if (token.contains(':')) {
-                    tokens.removeAt(j);
                     int colon = token.indexOf(':');
                     QString field = token.left(colon);
                     QString value = token.right(token.length()-colon-1);
@@ -66,6 +65,8 @@ void PasswordDialog::setPassword(QString password)
                     line->setObjectName(field);
                     line->setText(value);
                     ui->formLayout->addRow(new QLabel(field), line);
+                    tokens.removeAt(j);
+                    j--; // tokens.length() also got shortened by the remove..
                 }
             }
         }