[git] GpgOL - branch, master, updated. gpgol-1.4.0-270-g883676e

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  883676e5a8a72c628993df1ad994800c8a9afb21 (commit)
      from  a288530385d9395c64d7fa2c92ecc67ad2d0d67d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 883676e5a8a72c628993df1ad994800c8a9afb21
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jul 25 14:04:28 2017 +0200

    Ensure that the correct window is enabled again
    
    * src/mail.cpp (encrypt_sign): Store window handle.
    
    --
    This fixes a rare case where the active window changes during
    encrypt and the wrong window would be enabled again. This would
    result in an unsresponsive Outlook.

diff --git a/src/mail.cpp b/src/mail.cpp
index 027d71e..f0a32b8 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -904,7 +904,9 @@ Mail::encrypt_sign ()
     }
   flags = get_gpgol_draft_info_flags (message);
 
-  EnableWindow (get_active_hwnd(), FALSE);
+  const auto window = get_active_hwnd ();
+
+  EnableWindow (window, FALSE);
   if (flags == 3)
     {
       log_debug ("%s:%s: Sign / Encrypting message",
@@ -929,7 +931,7 @@ Mail::encrypt_sign ()
     }
   log_debug ("%s:%s: Status: %i",
              SRCNAME, __func__, err);
-  EnableWindow (get_active_hwnd(), TRUE);
+  EnableWindow (window, TRUE);
   gpgol_release (message);
   m_crypt_successful = !err;
   return err;

-----------------------------------------------------------------------

Summary of changes:
 src/mail.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org