From 473d408bb1354433cb4f18a7fdf047f467ecc6d8 Mon Sep 17 00:00:00 2001
From: Banana Joe <qtc-committer@nokia.com>
Date: Wed, 18 Feb 2009 12:51:29 +0100
Subject: [PATCH] Fixes: crash on reloading a resource file
RevBy: thorbjoern
Details: don't call ResourceView::reset() but ResourceModel::reset()
---
src/shared/qrceditor/resourcefile.cpp | 1 +
src/shared/qrceditor/resourceview.cpp | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/shared/qrceditor/resourcefile.cpp b/src/shared/qrceditor/resourcefile.cpp
index ae003d31532..82f706b98d0 100644
--- a/src/shared/qrceditor/resourcefile.cpp
+++ b/src/shared/qrceditor/resourcefile.cpp
@@ -930,6 +930,7 @@ bool ResourceModel::reload()
const bool result = m_resource_file.load();
if (result)
setDirty(false);
+ reset();
return result;
}
diff --git a/src/shared/qrceditor/resourceview.cpp b/src/shared/qrceditor/resourceview.cpp
index 94df537f2ce..a0066f3a7a9 100644
--- a/src/shared/qrceditor/resourceview.cpp
+++ b/src/shared/qrceditor/resourceview.cpp
@@ -489,9 +489,7 @@ bool ResourceView::load(QString fileName)
if (!fi.exists())
return false;
- const bool result = m_qrcModel->reload();
- reset();
- return result;
+ return m_qrcModel->reload();
}
bool ResourceView::save(void)
--
GitLab