SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

fix: The session file have not closed after read end

Browse Source
This commit is contained in:
dreamsourcelabTAI
2023-05-08 15:42:26 +08:00
parent 399055d34d
commit 5c286c09d7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DSView/pv/dialogs/about.cpp
View File

@@ -101,6 +101,7 @@ About::About(QWidget *parent) :
changlogs += line + "<br />";
}
}
news.close();
QPixmap pix(":/icons/dsl_logo.svg");
QImage logo = pix.toImage();

11
DSView/pv/mainwindow.cpp
View File

@@ -621,8 +621,9 @@ namespace pv
return false;
}
QString sdata = QString::fromUtf8(sf.readAll());
QString sdata = QString::fromUtf8(sf.readAll());
QJsonDocument sessionDoc = QJsonDocument::fromJson(sdata.toUtf8());
sf.close();
_protocol_widget->del_all_protocol();
int ret = load_session_json(sessionDoc, bDone);
@@ -1066,14 +1067,14 @@ namespace pv
dsv_info("Store session to file: \"%s\"", name.toLocal8Bit().data());
QFile sessionFile(name);
if (!sessionFile.open(QIODevice::WriteOnly | QIODevice::Text))
QFile sf(name);
if (!sf.open(QIODevice::WriteOnly | QIODevice::Text))
{
dsv_warn("%s", "Warning: Couldn't open session file to write!");
return false;
}
QTextStream outStream(&sessionFile);
QTextStream outStream(&sf);
encoding::set_utf8(outStream);
QJsonObject sessionVar;
@@ -1083,7 +1084,7 @@ namespace pv
QJsonDocument sessionDoc(sessionVar);
outStream << QString::fromUtf8(sessionDoc.toJson());
sessionFile.close();
sf.close();
return true;
}