summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2017-11-30 09:37:13 +0100
committerAndre Heinecke <[email protected]>2017-11-30 09:38:46 +0100
commit9bef188fd2a2b820a63e9c7ed130c0990b7f3ce5 (patch)
treecae23e24afdf97e94dd41e716fadd6ef9086f74c
parent25f4e03399f5495535f1db0bcd8a664fed774226 (diff)
Workaround / Fix crash of email cert dlg on Win
Somehow deleting this dialog here crashes on windows a bit later. As a workaround / fix we don't delete it here but rely instead on the deletion when the parent window is deleted. GnuPG-Bug-Id: 3544
-rw-r--r--src/crypto/gui/signencryptemailconflictdialog.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/crypto/gui/signencryptemailconflictdialog.cpp b/src/crypto/gui/signencryptemailconflictdialog.cpp
index c884e81..4c63f8d 100644
--- a/src/crypto/gui/signencryptemailconflictdialog.cpp
+++ b/src/crypto/gui/signencryptemailconflictdialog.cpp
@@ -348,7 +348,12 @@ private:
// ### switch to key.protocol(), in case proto == UnknownProtocol
break;
}
+#ifndef Q_OS_WIN
+ // This leads to a crash on Windows. We don't really
+ // leak memory here anyway because the destruction of the
+ // dialog happens when the parent (q) is destroyed anyway.
delete dlg;
+#endif
}
private: