[Enigma-cvs] enigma/src display.cc,1.35.2.6,1.35.2.7

[Daniel Heck <address@hidden>]

Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv28353/src

Modified Files:
      Tag: enigma0_80_rc
        display.cc 
Log Message:
Circumvented assertion failure... need to take a closer look later


Index: display.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/display.cc,v
retrieving revision 1.35.2.6
retrieving revision 1.35.2.7
diff -C2 -d -r1.35.2.6 -r1.35.2.7
*** display.cc  5 Oct 2003 13:09:57 -0000       1.35.2.6
--- display.cc  5 Oct 2003 13:33:38 -0000       1.35.2.7
***************
*** 322,327 ****
      list<Model*> &am = m_active_models;
      list<Model*>::iterator i = find(am.begin(), am.end(), m);
!     assert(i != am.end());
!     *i = 0;
  //    delete m;
  //    m_active_models.remove(m);
--- 322,331 ----
      list<Model*> &am = m_active_models;
      list<Model*>::iterator i = find(am.begin(), am.end(), m);
!     if (i == am.end()) {
!         m_active_models_new.remove(m);
!     } else {
!         //assert(i != am.end());
!         *i = 0;
!     }
  //    delete m;
  //    m_active_models.remove(m);