From c0c94ad6123e461e64387e5ccf32909f3fe4d6eb Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 15 Dec 2009 00:28:55 +0000 Subject: [PATCH] one dialog at a time in p3dCert --- direct/src/plugin/p3dCert.cxx | 4 ++++ direct/src/plugin/p3dX11SplashWindow.cxx | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/direct/src/plugin/p3dCert.cxx b/direct/src/plugin/p3dCert.cxx index d2bc1b64f2..fcf5b65e38 100644 --- a/direct/src/plugin/p3dCert.cxx +++ b/direct/src/plugin/p3dCert.cxx @@ -202,6 +202,7 @@ view_cert_clicked(wxCommandEvent &event) { if (_view_cert_dialog != NULL) { _view_cert_dialog->Destroy(); } + Hide(); _view_cert_dialog = new ViewCertDialog(this, _cert); _view_cert_dialog->Show(); } @@ -563,6 +564,9 @@ run_clicked(wxCommandEvent &event) { //////////////////////////////////////////////////////////////////// void ViewCertDialog:: cancel_clicked(wxCommandEvent &event) { + if (_auth_dialog != NULL){ + _auth_dialog->Destroy(); + } Destroy(); } diff --git a/direct/src/plugin/p3dX11SplashWindow.cxx b/direct/src/plugin/p3dX11SplashWindow.cxx index 0f6ee609be..907e2af607 100755 --- a/direct/src/plugin/p3dX11SplashWindow.cxx +++ b/direct/src/plugin/p3dX11SplashWindow.cxx @@ -173,8 +173,6 @@ set_install_progress(double install_progress, doc.LinkEndChild(xcommand); write_xml(_pipe_write, &doc, nout); - write_xml(nout, &doc, nout); - check_stopped(); }