From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 30 Oct 2022 12:45:18 +0000 (+0200)
Subject: ; Fix unclean code in w32fns.c
X-Git-Tag: emacs-29.0.90~1616^2~379
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cb8918d7cc028988bad79b66cbf577f2f37413e1;p=emacs.git

; Fix unclean code in w32fns.c

* src/w32fns.c (setup_w32_kbdhook): Fix a typo and check errors
from the call to StringFromGUID2.  Reported by Juanma Barranquero
<lekktu@gmail.com>.
---

diff --git a/src/w32fns.c b/src/w32fns.c
index 5f652ae9e46..93b7f80f268 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -2734,8 +2734,7 @@ setup_w32_kbdhook (void)
 	  int i;
 
 	  CoCreateGuid (&guid);
-	  StringFromGUID2 (&guid, newTitle, 64);
-	  if (newTitle != NULL)
+	  if (oldTitle != NULL && StringFromGUID2 (&guid, newTitle, 64))
 	    {
 	      GetConsoleTitleW (oldTitle, 1024);
 	      SetConsoleTitleW (newTitle);