Only show ssh agent menu items if entry has a key

keepassxreboot · Mar 19, 2020 · 67da7ee · 67da7ee
1 parent 9eaa0b2
commit 67da7ee
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -199,9 +199,6 @@ MainWindow::MainWindow()
 
     m_ui->actionEntryAddToAgent->setIcon(resources()->icon("utilities-terminal"));
     m_ui->actionEntryRemoveFromAgent->setIcon(resources()->icon("utilities-terminal"));
-
-    m_ui->actionEntryAddToAgent->setVisible(sshAgent()->isEnabled());
-    m_ui->actionEntryRemoveFromAgent->setVisible(sshAgent()->isEnabled());
 #else
     m_ui->actionEntryAddToAgent->setVisible(false);
     m_ui->actionEntryRemoveFromAgent->setVisible(false);
@@ -715,7 +712,9 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
             m_ui->actionDatabaseMerge->setEnabled(m_ui->tabWidget->currentIndex() != -1);
 #ifdef WITH_XC_SSHAGENT
             bool singleEntryHasSshKey = singleEntrySelected && dbWidget->currentEntryHasSshKey();
+            m_ui->actionEntryAddToAgent->setVisible(singleEntryHasSshKey);
             m_ui->actionEntryAddToAgent->setEnabled(singleEntryHasSshKey);
+            m_ui->actionEntryRemoveFromAgent->setVisible(singleEntryHasSshKey);
             m_ui->actionEntryRemoveFromAgent->setEnabled(singleEntryHasSshKey);
 #endif