vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

editor: error our gracefully when loading fails

Browse Source 
If an error happens while loading, the old document should be left
intact. Ensure this by not modifying the document until all loading
code has been run.
This commit is contained in:
Erik Faye-Lund 2011-03-28 22:18:39 +02:00
parent 9724884884
commit 8de60a4095
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/editor.cpp
View File

@ -213,18 +213,14 @@ void fileNew()
void loadDocument(const std::wstring &_fileName)
{
fileNew();
if (document.load(_fileName))
{
if (document.load(_fileName)) {
setWindowFileName(_fileName.c_str());
fileName = _fileName;
mruFileList.insert(_fileName);
mruFileList.update();
DrawMenuBar(hwnd);
document.clearUndoStack();
document.clearRedoStack();
trackView->setDocument(&document);
SendMessage(hwnd, WM_CURRVALDIRTY, 0, 0);

29
editor/syncdocument.cpp
View File

@ -13,19 +13,18 @@ SyncDocument::~SyncDocument()
bool SyncDocument::load(const std::wstring &fileName)
{
MSXML2::IXMLDOMDocumentPtr doc(MSXML2::CLSID_DOMDocument);
try
{
try {
SyncDocument::MultiCommand *multiCmd = new SyncDocument::MultiCommand();
for (size_t i = 0; i < num_tracks; ++i) {
sync_track *t = tracks[i];
for (size_t j = 0; j < t->num_keys; ++j)
multiCmd->addCommand(new SyncDocument::DeleteCommand(i, t->keys[j].row));
}
doc->load(fileName.c_str());
MSXML2::IXMLDOMNamedNodeMapPtr attribs = doc->documentElement->Getattributes();
MSXML2::IXMLDOMNodePtr rowsParam = attribs->getNamedItem("rows");
if (NULL != rowsParam)
{
std::string rowsString = rowsParam->Gettext();
this->setRows(atoi(rowsString.c_str()));
}
MSXML2::IXMLDOMNodeListPtr trackNodes = doc->documentElement->selectNodes("track");
for (int i = 0; i < trackNodes->Getlength(); ++i)
{
@ -58,6 +57,16 @@ bool SyncDocument::load(const std::wstring &fileName)
}
}
}
MSXML2::IXMLDOMNodePtr rowsParam = attribs->getNamedItem("rows");
if (rowsParam) {
std::string rowsString = rowsParam->Gettext();
this->setRows(atoi(rowsString.c_str()));
}
clearUndoStack();
clearRedoStack();
this->exec(multiCmd);
savePointDelta = 0;
savePointUnreachable = false;