diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-27 11:21:42 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-27 11:21:42 (GMT) |
| commit | c6b577b941aa216903ff99a9fe743a9c37b92fce (patch) | |
| tree | b8acdde776f10d428935ba3cff821aebe42d3292 /src/gui/dialogs | |
| parent | 38a44a97ee30214c450615f07588d5c2b733b5d5 (diff) | |
| parent | 61f2e17c497f683d7fa78232decb260bfa5b5d77 (diff) | |
| download | Qt-c6b577b941aa216903ff99a9fe743a9c37b92fce.zip Qt-c6b577b941aa216903ff99a9fe743a9c37b92fce.tar.gz Qt-c6b577b941aa216903ff99a9fe743a9c37b92fce.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qfiledialog_win.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog_win.cpp b/src/gui/dialogs/qfiledialog_win.cpp index d8ae73e..0116319 100644 --- a/src/gui/dialogs/qfiledialog_win.cpp +++ b/src/gui/dialogs/qfiledialog_win.cpp @@ -534,7 +534,7 @@ QStringList qt_win_CID_get_open_file_names(const QFileDialogArgs &args, modal_widget.setParent(args.parent, Qt::Window); QApplicationPrivate::enterModal(&modal_widget); // Multiple selection is allowed only in IFileOpenDialog. - IFileOpenDialog *pfd; + IFileOpenDialog *pfd = 0; HRESULT hr = CoCreateInstance(CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, @@ -607,6 +607,8 @@ QStringList qt_win_CID_get_open_file_names(const QFileDialogArgs &args, } } } + if (pfd) + pfd->Release(); return result; } |