From cf98d1e60764e22e2e3f168708818106af99c498 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@digia.com>
Date: Thu, 13 Jun 2013 17:50:39 +0200
Subject: OSX color dialog can be accepted repeatedly

QNSColorPanelDelegate::finishOffWithCode sets mResultSet = true
and it needs to be set false again the next time the dialog is shown.

Task-number: QTBUG-31566
Change-Id: If1d4bb9d4e76273c6423f5bf2ae37790e8a9704e
Reviewed-by: Liang Qi <liang.qi@digia.com>
---
 src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
index a0dac445be..514ea0482f 100644
--- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
+++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
@@ -274,6 +274,7 @@ static NSButton *macCreateButton(const char *text, NSView *superview)
 - (void)showModelessPanel
 {
     mDialogIsExecuting = false;
+    mResultSet = false;
     [mColorPanel makeKeyAndOrderFront:mColorPanel];
 }
 
-- 
cgit v1.2.3