0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE fix saving the servers.dat file when it doesn't exist yet

Browse Source
This commit is contained in:
Petr Mrázek 2018-06-30 01:27:44 +02:00
parent 44381c09d7
commit 8516a6646e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
application/pages/instance/ServersPage.cpp
View File

@ -119,6 +119,10 @@ static bool serializeServerDat(const QString& filename, nbt::tag_compound * leve
{ {
try try
{ {
if(!FS::ensureFilePathExists(filename))
{
return false;
}
std::ostringstream s; std::ostringstream s;
nbt::io::write_tag("", *levelInfo, s); nbt::io::write_tag("", *levelInfo, s);
QByteArray val(s.str().data(), (int) s.str().size() ); QByteArray val(s.str().data(), (int) s.str().size() );
@ -460,7 +464,8 @@ private slots:
void save_internal() void save_internal()
{ {
cancelSave(); cancelSave();
qDebug() << "Server list save is performed for" << m_path; QString path = serversPath();
qDebug() << "Server list about to be saved to" << path;
nbt::tag_compound out; nbt::tag_compound out;
nbt::tag_list list; nbt::tag_list list;
@ -472,9 +477,9 @@ private slots:
} }
out.insert("servers", nbt::value(std::move(list))); out.insert("servers", nbt::value(std::move(list)));
if(!serializeServerDat(serversPath(), &out)) if(!serializeServerDat(path, &out))
{ {
qDebug() << "Failed to save server list:" << m_path << "Will try again."; qDebug() << "Failed to save server list:" << path << "Will try again.";
scheduleSave(); scheduleSave();
} }
} }
@ -536,7 +541,7 @@ private:
QString serversPath() QString serversPath()
{ {
QFileInfo foo(FS::PathCombine(m_path, "servers.dat")); QFileInfo foo(FS::PathCombine(m_path, "servers.dat"));
return foo.canonicalFilePath(); return foo.filePath();
} }
private: private: