Windows: Fix QWindowsNativeFileDialogBase::directory()

The item was never initialized.

Change-Id: Iaf404c7f601713886c1c1346cc145460e7e89171
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index 12ea880..7cd857e 100644 (file)
--- 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)