osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Ensure that fixFilenameExtension() is used only when writing a file. 

It *should* never happen, but just make sure of that by calling it only
for "open for writing" ("save") dialogs.

Change-Id: I1813f31537c0aa4efdf08c1622db9cb9e7f5ae83
Reviewed-on: https://code.wireshark.org/review/30726
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-11-19 14:28:05 -08:00
parent 3653e23097
commit c055d32d10
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui/qt/capture_file_dialog.cpp
View File

@ -220,13 +220,22 @@ check_savability_t CaptureFileDialog::checkSaveAsWithComments(QWidget *
#ifndef Q_OS_WIN
void CaptureFileDialog::accept()
{
// XXX also useful for Windows, but that uses a different dialog...
// Ensure that the filename has a valid extension before performing file
//
// If this is a dialog for writing files, we want to ensure that
// the filename has a valid extension before performing file
// existence checks and before closing the dialog.
// HACK: ensure that the filename field does not have the focus, otherwise
// selectFile will not change the filename.
setFocus();
fixFilenameExtension();
// This isn't necessary for dialogs for reading files; the name
// has to exactly match the name of the file you want to open,
// and doesn't need to be, and shouldn't be, modified.
//
// XXX also useful for Windows, but that uses a different dialog...
//
if (acceptMode() == QFileDialog::AcceptSave) {
// HACK: ensure that the filename field does not have the focus,
// otherwise selectFile will not change the filename.
setFocus();
fixFilenameExtension();
}
QFileDialog::accept();
}
#endif // ! Q_OS_WIN
@ -448,6 +457,7 @@ QStringList CaptureFileDialog::buildFileOpenTypeList() {
}
// Replaces or appends an extension based on the current file filter.
// Used in dialogs that select a file to write.
void CaptureFileDialog::fixFilenameExtension()
{
QFileInfo fi(selectedFiles()[0]);