Mercurial > dwindows

changeset 2945:7e7b38472c3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mac: dw_messagebox() changes in that last commit didn't account for return; Use a retval variable instead which returns after draining the pool.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Mon, 02 Jan 2023 01:44:17 +0000
parents 3dde7456c9f6
children 11fd5cf0ee99
files mac/dw.m
diffstat 1 files changed, 12 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Mon Jan 02 01:36:06 2023 +0000
+++ b/mac/dw.m	Mon Jan 02 01:44:17 2023 +0000
@@ -4395,6 +4395,7 @@
     NSString *mtext;
     NSAlertStyle mstyle = DWAlertStyleWarning;
     NSArray *params;
+    int retval = 0;
 
     if(flags & DW_MB_OKCANCEL)
     {
@@ -4427,21 +4428,22 @@
     {
         case NSAlertFirstButtonReturn:    /* user pressed OK */
             if(flags & DW_MB_YESNO || flags & DW_MB_YESNOCANCEL)
-            {
-                return DW_MB_RETURN_YES;
-            }
-            return DW_MB_RETURN_OK;
+                retval = DW_MB_RETURN_YES;
+            else
+                retval = DW_MB_RETURN_OK;
+            break;
         case NSAlertSecondButtonReturn:  /* user pressed Cancel */
             if(flags & DW_MB_OKCANCEL)
-            {
-                return DW_MB_RETURN_CANCEL;
-            }
-            return DW_MB_RETURN_NO;
+                retval = DW_MB_RETURN_CANCEL;
+            else
+                retval = DW_MB_RETURN_NO;
+            break;
         case NSAlertThirdButtonReturn:      /* user pressed the third button */
-            return DW_MB_RETURN_CANCEL;
+            retval = DW_MB_RETURN_CANCEL;
+            break;
     }
     DW_LOCAL_POOL_OUT;
-    return 0;
+    return retval;
 }
 
 /*