From c505a16451c7b03740d895897d292ad178f99b23 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 3 May 2012 09:59:34 +0200 Subject: [PATCH] Windows: Fix QWindowsNativeFileDialogBase::directory() The item was never initialized. Change-Id: Iaf404c7f601713886c1c1346cc145460e7e89171 Reviewed-by: Miikka Heikkinen Reviewed-by: Friedemann Kleint --- src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 12ea880..7cd857e 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -770,8 +770,9 @@ void QWindowsNativeFileDialogBase::setDirectory(const QString &directory) QString QWindowsNativeFileDialogBase::directory() const { IShellItem *item = 0; - return (m_fileDialog && item) ? - QWindowsNativeFileDialogBase::itemPath(item) : QString(); + if (m_fileDialog && SUCCEEDED(m_fileDialog->GetFolder(&item)) && item) + return QWindowsNativeFileDialogBase::itemPath(item); + return QString(); } void QWindowsNativeFileDialogBase::exec(HWND owner) -- 2.7.4