ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HighScoresDialog exception fix

This commit is contained in:
thrust26 2020-12-01 18:30:14 +01:00
parent 9dd0215fed
commit 927738e2db
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/HighScoresDialog.cxx
View File

@ -534,24 +534,6 @@ void HighScoresDialog::saveHighScores(Int32 variation) const
buf << instance().stateDir() << cartName() << ".hs" << variation; buf << instance().stateDir() << cartName() << ".hs" << variation;
//// Make sure the file can be opened for writing
//Serializer out(buf.str());
//if(!out)
//{
// buf.str("");
// buf << "Can't open/save to high scores file for variation " << variation;
// instance().frameBuffer().showTextMessage(buf.str());
//}
//// Do a complete high scores save
//if(!save(out, variation))
//{
// buf.str("");
// buf << "Error saving high scores for variation" << variation;
// instance().frameBuffer().showTextMessage(buf.str());
//}
// Make sure the file can be opened for writing // Make sure the file can be opened for writing
FilesystemNode node(buf.str()); FilesystemNode node(buf.str());
@ -589,7 +571,6 @@ void HighScoresDialog::loadHighScores(Int32 variation)
FilesystemNode node(buf.str()); FilesystemNode node(buf.str());
stringstream in; stringstream in;
buf.str("");
// Make sure the file can be opened // Make sure the file can be opened
try { try {
node.read(in); node.read(in);
@ -600,12 +581,10 @@ void HighScoresDialog::loadHighScores(Int32 variation)
string highscores; string highscores;
buf.str(""); buf.str("");
// Make sure the file can be opened
node.read(in);
if(getline(in, highscores) && highscores.length() != 0) if(getline(in, highscores) && highscores.length() != 0)
{ {
cerr << endl << highscores << endl; cerr << endl << highscores << endl << endl;
const json hsData = json::parse(highscores); const json hsData = json::parse(highscores);
// First test if we have a valid header // First test if we have a valid header
@ -621,9 +600,8 @@ void HighScoresDialog::loadHighScores(Int32 variation)
} }
} }
} }
catch(const std::exception& ex) catch(...)
{ {
//@CS: 'const json hsData = json::parse(highscores)' causes this
buf << "Invalid data in high scores for variation " << variation << " file"; buf << "Invalid data in high scores for variation " << variation << " file";
} }
instance().frameBuffer().showTextMessage(buf.str()); instance().frameBuffer().showTextMessage(buf.str());