whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Friedemann Kleint 2012-05-03 09:59:34 +02:00 committed by Qt by Nokia
parent b6a4d69830
commit c505a16451
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
View File

@ -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)