(no commit message)

[imagemagick] / MagickCore / widget.c

diff --git a/MagickCore/widget.c b/MagickCore/widget.c
index db56bf5811c71a6d69ec4d493c20c687ddae57a4..cd77001808afef9a4d5ef36b266b36eca0acbe76 100644 (file)
--- a/MagickCore/widget.c
+++ b/MagickCore/widget.c
@@ -2254,8 +2254,9 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows,
             /*
               User pressed mode button.
             */
-            (void) CopyMagickString(reply_info.text,mode_info.text,
-              MaxTextExtent);
+            if (mode_info.text != (char *) NULL)
+              (void) CopyMagickString(reply_info.text,mode_info.text,
+                MaxTextExtent);
             (void) CopyMagickString(primary_selection,reply_info.text,
               MaxTextExtent);
             (void) XSetSelectionOwner(display,XA_PRIMARY,windows->widget.id,
@@ -3590,7 +3591,7 @@ MagickPrivate int XConfirmWidget(Display *display,XWindows *windows,
             /*
               Dismiss button status changed.
             */
-            dismiss_info.raised=cancel_info.raised == MagickFalse ?
+            dismiss_info.raised=dismiss_info.raised == MagickFalse ?
               MagickTrue : MagickFalse;
             XDrawBeveledButton(display,&windows->widget,&dismiss_info);
             break;