diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-24 12:17:35 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-24 12:17:39 +0100 |
| commit | db5e22e0537ae262270660201519c5c20f30951a (patch) | |
| tree | 4c6140c0448ab95f50041655d272591875337d54 /src/qt/paymentserver.h | |
| parent | 93566e0c37c5ae104095474fea89f00dcb40f551 (diff) | |
| parent | ed998ea7a0ecf294211b06e9ef82f1548a621a1d (diff) | |
| download | bitcoin-db5e22e0537ae262270660201519c5c20f30951a.tar.xz | |
Merge #9190: qt: Plug many memory leaks
ed998ea qt: Avoid OpenSSL certstore-related memory leak (Wladimir J. van der Laan)
5204598 qt: Avoid shutdownwindow-related memory leak (Wladimir J. van der Laan)
e4f126a qt: Avoid splash-screen related memory leak (Wladimir J. van der Laan)
693384e qt: Prevent thread/memory leak on exiting RPCConsole (Wladimir J. van der Laan)
47db075 qt: Plug many memory leaks (Wladimir J. van der Laan)
Diffstat (limited to 'src/qt/paymentserver.h')
| -rw-r--r-- | src/qt/paymentserver.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index 2d27ed078b..7202e7dada 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -83,7 +83,7 @@ public: static void LoadRootCAs(X509_STORE* store = NULL); // Return certificate store - static X509_STORE* getCertStore() { return certStore; } + static X509_STORE* getCertStore(); // OptionsModel is used for getting proxy settings and display unit void setOptionsModel(OptionsModel *optionsModel); @@ -140,9 +140,6 @@ private: bool saveURIs; // true during startup QLocalServer* uriServer; - static X509_STORE* certStore; // Trusted root certificates - static void freeCertStore(); - QNetworkAccessManager* netManager; // Used to fetch payment requests OptionsModel *optionsModel; |