[colobot] 116/390: Fixed #340 again

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit ef1edba3073d219125ede64ec2a88ca5ed77b93b
Author: krzys-h <krzys_h at interia.pl>
Date:   Sat Oct 25 17:09:14 2014 +0200

    Fixed #340 again
---
 src/ui/maindialog.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp
index e46d613..3dce5a0 100644
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@ -4497,8 +4497,13 @@ void CMainDialog::UpdateSceneList(int chap, int &sel)
     for ( j=0 ; j<99 ; j++ )
     {
         CLevelParser* level = new CLevelParser(m_sceneName, chap+1, j+1);
-        if(!level->Exists())
+        if(!level->Exists()) {
+            readAll = true;
             break;
+        } else {
+            if(!readAll)
+                break;
+        }
         try {
             level->Load();
             sprintf(line, "%d: %s", j+1, level->Get("Title")->GetParam("text")->AsString().c_str());
@@ -4515,9 +4520,7 @@ void CMainDialog::UpdateSceneList(int chap, int &sel)
 
         if ( m_phase == PHASE_MISSION && !m_main->GetShowAll() && !bPassed )
         {
-            j ++;
             readAll = false;
-            break;
         }
     }
 
@@ -4529,6 +4532,7 @@ void CMainDialog::UpdateSceneList(int chap, int &sel)
     {
         m_maxList = j+1;  // this is not the last!
     }
+    CLogger::GetInstancePointer()->Debug("m_maxList = %d\n", m_maxList);
 
     if ( sel > j-1 )  sel = j-1;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git