osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

CaptureFile.fileTitle() is for display, not for file name processing. 

Don't use CaptureFile.fileTitle() if you're constructing a pathname; use
it only if you're constructing a window title.

Change-Id: I40f225ddb07be2f7dc3ae03108dae816846f20c7
Reviewed-on: https://code.wireshark.org/review/28582
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-07-03 15:40:45 -07:00
parent 670377f491
commit d76db1de78
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/iax2_analysis_dialog.cpp
View File

@ -571,7 +571,7 @@ void Iax2AnalysisDialog::on_actionSaveGraph_triggered()
QString save_file = path.canonicalPath();
if (!file_closed_) {
save_file += QString("/%1").arg(cap_file_.fileTitle());
save_file += QString("/%1").arg(cap_file_.fileName());
}
file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)),
save_file, filter, &extension);

2
ui/qt/io_graph_dialog.cpp
View File

@ -1402,7 +1402,7 @@ void IOGraphDialog::on_buttonBox_accepted()
QString save_file = path.canonicalPath();
if (!file_closed_) {
save_file += QString("/%1").arg(cap_file_.fileTitle());
save_file += QString("/%1").arg(cap_file_.fileName());
}
file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)),
save_file, filter, &extension);

2
ui/qt/rtp_analysis_dialog.cpp
View File

@ -609,7 +609,7 @@ void RtpAnalysisDialog::on_actionSaveGraph_triggered()
QString save_file = path.canonicalPath();
if (!file_closed_) {
save_file += QString("/%1").arg(cap_file_.fileTitle());
save_file += QString("/%1").arg(cap_file_.fileName());
}
file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)),
save_file, filter, &extension);

2
ui/qt/rtp_stream_dialog.cpp
View File

@ -497,7 +497,7 @@ void RtpStreamDialog::on_actionExportAsRtpDump_triggered()
if (stream_info) {
QString file_name;
QDir path(wsApp->lastOpenDir());
QString save_file = path.canonicalPath() + "/" + cap_file_.fileTitle();
QString save_file = path.canonicalPath() + "/" + cap_file_.fileName();
QString extension;
file_name = WiresharkFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save RTPDump As" UTF8_HORIZONTAL_ELLIPSIS)),
save_file, "RTPDump Format (*.rtpdump)", &extension);