summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2012-12-08 01:55:11 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-19 00:28:34 +0100
commitb724dc51683bb250e8434c2115709a0b178736a6 (patch)
tree5d90f61f031e907b466e09298824ff5329f075ef /src/gui/dialogs
parent5b285845a3c3478a4008b7e3416c3912c69fd20b (diff)
Ensure the native filedialog starts up with the right directory
On Mac it was not starting the dialog with the specified directory when one was present. If a filename was given as well then it would start up fine. Task-number: QTBUG-28161 Change-Id: I7cce0d065dd57e6433ce62380d4263d6e20b6e7c Reviewed-by: Liang Qi <liang.qi@digia.com> (cherry picked from commit d75d86190bca85841db2040d50184f4c6886ef89) Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src/gui/dialogs')
-rw-r--r--src/gui/dialogs/qfiledialog_mac.mm2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm
index 4c1c74b257..40fca767ae 100644
--- a/src/gui/dialogs/qfiledialog_mac.mm
+++ b/src/gui/dialogs/qfiledialog_mac.mm
@@ -448,6 +448,8 @@ QT_USE_NAMESPACE
if ([path isEqualToString:mCurrentDir])
return;
+ if ([mSavePanel respondsToSelector:@selector(isVisible)] && ![mSavePanel isVisible])
+ return;
[mCurrentDir release];
mCurrentDir = [path retain];
mPriv->QNSOpenSavePanelDelegate_directoryEntered(QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString(mCurrentDir)));