Don't ask twice for masterkey during export

Rookiestyle · Sep 10, 2020 · 8cba454 · 8cba454
1 parent 6483b04
commit 8cba454
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/Options.cs b/src/Options.cs
@@ -324,7 +324,12 @@ private void bExport_Click(object sender, EventArgs e)
 			PwDatabase db = m_dDB.ElementAt(lbDB.SelectedIndex).Key;
 			RefreshHandler(db);
 			//if (!m_handler.SetDB(db, false)) return;
-			if (!AppPolicy.Current.ExportNoKey && !m_handler.ReAskKey()) return;
+			//If configured, KeePass 2.46 will ask for the masterkey during the export
+			//No need to ask here
+			if (Tools.KeePassVersion < new Version(2, 46))
+			{
+				if (!AppPolicy.Current.ExportNoKey && !m_handler.ReAskKey()) return;
+			}
 
 			db = m_handler.OTPDB;
 			PwGroup pg = db.RootGroup;

diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.14")]
-[assembly: AssemblyFileVersion("0.14")]
+[assembly: AssemblyVersion("0.15")]
+[assembly: AssemblyFileVersion("0.15")]
diff --git a/version.info b/version.info
@@ -1,5 +1,5 @@
 :
-KeePassOTP:0.14
+KeePassOTP:0.15
 KeePassOTP!de:9
 KeePassOTP!fr:2
 :