diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-05-03 09:59:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 11:33:05 +0200 |
| commit | c505a16451c7b03740d895897d292ad178f99b23 (patch) | |
| tree | fe4ac30e2c27506aa4d65f5c51bd89f5150709c5 /src/plugins | |
| parent | b6a4d69830c0d188b4f6c424808390dd8e3a90bc (diff) | |
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>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 12ea880ab0..7cd857e3a4 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) |