Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

This commit is contained in:
hjk
2009-02-18 14:38:55 +01:00
2 changed files with 2 additions and 3 deletions

View File

@@ -930,6 +930,7 @@ bool ResourceModel::reload()
const bool result = m_resource_file.load(); const bool result = m_resource_file.load();
if (result) if (result)
setDirty(false); setDirty(false);
reset();
return result; return result;
} }

View File

@@ -489,9 +489,7 @@ bool ResourceView::load(QString fileName)
if (!fi.exists()) if (!fi.exists())
return false; return false;
const bool result = m_qrcModel->reload(); return m_qrcModel->reload();
reset();
return result;
} }
bool ResourceView::save(void) bool ResourceView::save(void)