mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-30 19:29:52 +02:00
Code Issues Projects Releases Wiki Activity

Fix ParseExceptions falling through;

Browse Source 
Apparently since when the RequestBroker was added, the logic has been changed,
and the exception no longer comes through PreviewController's try{} block.
This commit is contained in:
mniip
2014-01-25 15:38:00 +04:00
parent f66679e551
commit 09beafed3a
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/preview/PreviewController.cpp
View File

@@ -62,16 +62,6 @@ void PreviewController::Update()
delete loginWindow;
loginWindow = NULL;
}
try
{
previewModel->Update();
}
catch (PreviewModelException & e)
{
Exit();
new ErrorMessage("Error", e.what());
}
if(previewModel->GetDoOpen() && previewModel->GetSave() && previewModel->GetSave()->GetGameSave())
{
Exit();

3
src/gui/preview/PreviewModel.cpp
View File

@@ -2,6 +2,7 @@
#include "PreviewModel.h"
#include "client/Client.h"
#include "client/GameSave.h"
#include "gui/dialogues/ErrorMessage.h"
#include "PreviewModelException.h"
PreviewModel::PreviewModel():
@@ -174,7 +175,7 @@ void PreviewModel::OnResponseReady(void * object, int identifier)
}
catch(ParseException &e)
{
throw PreviewModelException("Save file corrupt or from newer version");
new ErrorMessage("Error", e.what());
}
notifySaveChanged();
notifyCommentsPageChanged();