From 22d5216daea49335ddf12a9247842f4246f985ce Mon Sep 17 00:00:00 2001 From: JanisEst Date: Tue, 19 Jan 2016 20:26:48 +0100 Subject: [PATCH] fixed spr data handling --- KeePassQRCodeViewExt.cs | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/KeePassQRCodeViewExt.cs b/KeePassQRCodeViewExt.cs index e736039..aba844c 100644 --- a/KeePassQRCodeViewExt.cs +++ b/KeePassQRCodeViewExt.cs @@ -159,22 +159,19 @@ public void OnShowQRCode(object sender, DynamicMenuEventArgs e) var value = pe.Strings.GetSafe(key).ReadString(); - char scan, wanted; - pe = SprEngine.FindRefTarget( - value, - new SprContext(pe, host.Database, SprCompileFlags.All), - out scan, - out wanted - ); - if (null != pe) + value = SprEngine.Compile(value, new SprContext(pe, host.Database, SprCompileFlags.All)); + + try { - value = pe.Strings.GetSafe(key).ReadString(); + var data = new QRCodeGenerator().CreateQrCode(value, QRCodeGenerator.ECCLevel.L); + if (data != null) + { + new ShowQRCodeForm(data.GetBitmap(10, Color.Black, Color.White)).ShowDialog(); + } } - - var data = new QRCodeGenerator().CreateQrCode(value, QRCodeGenerator.ECCLevel.L); - if (data != null) + catch { - new ShowQRCodeForm(data.GetBitmap(10, Color.Black, Color.White)).ShowDialog(); + MessageBox.Show("The data can't be displayed as a QR Code."); } } }