Author: schubi2 Date: Wed May 28 12:05:42 2008 New Revision: 10251 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10251&view=rev Log: avoid endless loop Modified: trunk/dialogsolver/src/solvertree.cpp trunk/dialogsolver/src/solvertree.h Modified: trunk/dialogsolver/src/solvertree.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/solvertree.cpp?rev=10251&r1=10250&r2=10251&view=diff ============================================================================== --- trunk/dialogsolver/src/solvertree.cpp (original) +++ trunk/dialogsolver/src/solvertree.cpp Wed May 28 12:05:42 2008 @@ -135,8 +135,10 @@ childList.append(ResGraphView::targetData(idStr)); data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].item=it->item; + alreadyHitItems.insert (item); + // we have found a root; collect all trees - if (it->item != item) + if (alreadyHitItems.find(it->item) == alreadyHitItems.end()) buildTree ( data, data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].targets, it->item, id); } } Modified: trunk/dialogsolver/src/solvertree.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/solvertree.h?rev=10251&r1=10250&r2=10251&view=diff ============================================================================== --- trunk/dialogsolver/src/solvertree.h (original) +++ trunk/dialogsolver/src/solvertree.h Wed May 28 12:05:42 2008 @@ -29,6 +29,9 @@ /** @author Rajko Albrecht */ + +typedef std::setzypp::PoolItem PoolItemSet; + class SolverTree{ public: SolverTree( QWidget*treeParent, @@ -43,7 +46,7 @@ bool m_Valid; zypp::solver::detail::Resolver_Ptr resolver; StreeData*m_Data; - + PoolItemSet alreadyHitItems; void buildTree ( StreeData *data, ResGraphView::tlist &childList, const zypp::PoolItem item, int &id); }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org