Changeset 1633 for trunk/dll/command.c

Timestamp:

Sep 24, 2011, 9:16:07 PM (14 years ago)

Author:

Gregg Young

Message:

Fix trap on duplicate hot warning dialog exit if cancel is selected. Ticket 476

File:

• trunk/dll/command.c (modified) (3 diffs)

trunk/dll/command.c

@@ -1021 +1021 @@
             fDontCheckHotKey = TRUE;
           info = add_command(temp, fDontCheckHotKey);
-          if (info == (LINKCMDS *) -1)
+          if (info == (LINKCMDS *) -1) {
+            free(temp->pszCmdLine);
+            free(temp);
             break;
+          }
         }
         else {
@@ -1076 +1079 @@
             break;
           }
-        x = (SHORT) WinSendDlgItemMsg(hwnd,
-                                      CMD_LISTBOX,
-                                      LM_INSERTITEM,
-                                      MPFROM2SHORT(LIT_END, 0),
-                                      MPFROMP(temp->title));
-        if (x >= 0) {
-          WinSendDlgItemMsg(hwnd,
-                            CMD_LISTBOX,
-                            LM_SETITEMHANDLE,
-                            MPFROMSHORT(x), MPFROMP(info));
-          WinSendDlgItemMsg(hwnd,
-                            CMD_LISTBOX,
-                            LM_SELECTITEM,
-                            MPFROMSHORT(x), MPFROMSHORT(TRUE));
+          if (info == (LINKCMDS *) -1) {
+            free(temp->pszCmdLine);
+            free(temp);
+            break;
+          }
+          x = (SHORT) WinSendDlgItemMsg(hwnd,
+                                        CMD_LISTBOX,
+                                        LM_INSERTITEM,
+                                        MPFROM2SHORT(LIT_END, 0),
+                                        MPFROMP(temp->title));
+          if (x >= 0) {
+            WinSendDlgItemMsg(hwnd,
+                              CMD_LISTBOX,
+                              LM_SETITEMHANDLE,
+                              MPFROMSHORT(x), MPFROMP(info));
+            WinSendDlgItemMsg(hwnd,
+                              CMD_LISTBOX,
+                              LM_SELECTITEM,
+                              MPFROMSHORT(x), MPFROMSHORT(TRUE));
           }
           save_commands();
@@ -1192 +1200 @@
         } // then do an add
         info = add_command(temp, fDontCheckHotKey);
-        if (!info) {
-          saymsg(MB_ENTER, hwnd, GetPString(IDS_ERRORTEXT),
-                 GetPString(IDS_CANTADDCOMMANDTEXT),
-                 temp->title);
+        if (!info || info == (LINKCMDS *) -1) {
+          if (!info)
+            saymsg(MB_ENTER, hwnd, GetPString(IDS_ERRORTEXT),
+                   GetPString(IDS_CANTADDCOMMANDTEXT),
+                   temp->title);
         }
         else {