From 7eebf9abbac1393ea1eb457ccda65a9bcd04fb38 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 10 Feb 2013 22:21:09 +0200 Subject: [PATCH] Git: Fix preserving selection from previous submit editor Change-Id: Ideab3cb6c9250ab45f4a896e21ffd6007d810158 Reviewed-by: Tobias Hunger --- src/plugins/git/gitsubmiteditor.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp index 5fdadf234e3..2dcb39a427e 100644 --- a/src/plugins/git/gitsubmiteditor.cpp +++ b/src/plugins/git/gitsubmiteditor.cpp @@ -53,11 +53,13 @@ public: void updateSelections(SubmitFileModel *source) { + QTC_ASSERT(source, return); + GitSubmitFileModel *gitSource = static_cast(source); int j = 0; for (int i = 0; i < rowCount() && j < source->rowCount(); ++i) { CommitData::StateFilePair stateFile = stateFilePair(i); for (; j < source->rowCount(); ++j) { - CommitData::StateFilePair sourceStateFile = stateFilePair(j); + CommitData::StateFilePair sourceStateFile = gitSource->stateFilePair(j); if (stateFile == sourceStateFile) { setChecked(i, source->checked(j)); break; @@ -69,7 +71,7 @@ public: } private: - CommitData::StateFilePair stateFilePair(int row) + CommitData::StateFilePair stateFilePair(int row) const { return CommitData::StateFilePair(static_cast(extraData(row).toInt()), file(row)); }